Added support for v1.18.0

README.md

@@ -6,6 +6,8 @@ Project which takes [HashiCorp Vault](https://github.com/hashicorp/vault/) sourc
 > Before migration to v1.15.6, don't forget to duplicate all your policies with the new formatted names.  
 > After migration, you'll be able to remove old policies.
 
+> **Please note that the GitLab connector is only available with a full-Vault build starting 1.18.0.
+
 ## Building the image
 
 ### How it works
@@ -35,6 +37,9 @@ To patch and ignore errors, you can run `git apply --reject --whitespace=fix ../
 fix all files that were rejected. Run a `git add . && git commit -m "new version"` in `vault` directory, then
 a `git diff HEAD~1 > ../patches/v<DESIRED_VERSION>.patch` to save the full diff.
 
+Starting v1.18.0, you can use the `patch.sh` command by adding a `--dev` argument at the end of the command. For
+example: `./patch.sh v1.18.0 --dev`.
+
 _____________
 
 ## Using the connector (as an administrator)

patch.sh

@@ -10,10 +10,14 @@ if [ ! -f "patches/$1.patch" ]; then
   exit 1
 fi
 
+ADDITIONAL_ARGS=""
+if [ "$2" = "--dev" ]; then
+  ADDITIONAL_ARGS="--3way --whitespace=fix"
+fi
 
 rm -rf vault/ > /dev/null 2>&1
 
 git clone -b $1 https://github.com/hashicorp/vault.git vault
 cd ./vault
-git apply ../patches/$1.patch
+git apply $ADDITIONAL_ARGS ../patches/$1.patch
 echo "SUCCESS : If not error occurred, source have been patched !"