Merge branch 'reconcile2' into 'master'

Use --local for setting bundle config

See merge request gitlab-org/gitlab!56983

doc/install/installation.md

@@ -570,8 +570,8 @@ Install the gems (if you want to use Kerberos for user authentication, omit
 `kerberos` in the `--without` option below):
 ```shell
-sudo -u git -H bundle config set deployment 'true'
-sudo -u git -H bundle config set without 'development test mysql aws kerberos'
+sudo -u git -H bundle config set --local deployment 'true'
+sudo -u git -H bundle config set --local without 'development test mysql aws kerberos'
 sudo -u git -H bundle install
 ```

doc/update/patch_versions.md

@@ -43,7 +43,12 @@ sudo -u git -H git checkout LATEST_TAG -b LATEST_TAG
 ```shell
 cd /home/git/gitlab
-sudo -u git -H bundle install --without development test mysql --deployment
+# If you haven't done so during installation or a previous upgrade already
+sudo -u git -H bundle config set --local deployment 'true'
+sudo -u git -H bundle config set --local without 'development test mysql aws kerberos'
+
+# Update gems
+sudo -u git -H bundle install
 # Optional: clean up old gems
 sudo -u git -H bundle clean

doc/update/upgrading_from_ce_to_ee.md

@@ -63,8 +63,11 @@ sudo -u git -H git checkout EE_BRANCH
 ```shell
 cd /home/git/gitlab
-sudo -u git -H bundle config set deployment 'true'
-sudo -u git -H bundle config set without 'development test mysql aws kerberos'
+# If you haven't done so during installation or a previous upgrade already
+sudo -u git -H bundle config set --local deployment 'true'
+sudo -u git -H bundle config set --local without 'development test mysql aws kerberos'
+
+# Update gems
 sudo -u git -H bundle install
 # Optional: clean up old gems

doc/update/upgrading_from_source.md

@@ -269,8 +269,8 @@ sudo systemctl daemon-reload
 cd /home/git/gitlab
 # If you haven't done so during installation or a previous upgrade already
-sudo -u git -H bundle config set deployment 'true'
-sudo -u git -H bundle config set without 'development test mysql aws kerberos'
+sudo -u git -H bundle config set --local deployment 'true'
+sudo -u git -H bundle config set --local without 'development test mysql aws kerberos'
 # Update gems
 sudo -u git -H bundle install