diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-05-13 20:51:06 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-05-13 20:51:06 +0000 |
| commit | d7a28f3c12950d56a187148fda9dce39a9f2bf08 (patch) | |
| tree | 4570d08bb3343af5924505bcaf34fff25564cd70 | |
| parent | 710ebf164fdbdfb80510960e87af08bba4157a4b (diff) | |
| parent | 935c684ad3427069431a1130d364a4481af6cb65 (diff) | |
| download | gitlab-ce-d7a28f3c12950d56a187148fda9dce39a9f2bf08.tar.gz | |
Merge branch 'revert-3955' into 'master'
Revert "Merge branch 'doc-fix-db-gem-install-instructions' into 'master'"
This reverts commit 66d8ef1ad9d5952b7e7f026658f71aafc861950e, reversing
changes made to 6a8359f3d3be01af6f5b124b61af7ee1c77c17d0.
The `--with` option was added in Bundler 1.10 but in this case it
shouldn't even be needed: I've tested the original command locally and
the pg gem was installed, so I believe the user that opened the original
MR ran the wrong command (i.e. `sudo -u git -H bundle install --without
development test postgres --deployment` instead of `sudo -u git -H bundle
install --without development test mysql --deployment`.
See discussion at
https://gitlab.com/gitlab-org/gitlab-ce/commit/66d8ef1ad9d5952b7e7f026658f71aafc861950e
for more context.
See merge request !4144
| -rw-r--r-- | doc/update/patch_versions.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/update/patch_versions.md b/doc/update/patch_versions.md index b4283a526f3..60729316cde 100644 --- a/doc/update/patch_versions.md +++ b/doc/update/patch_versions.md @@ -57,10 +57,10 @@ sudo -u git -H make cd /home/git/gitlab # PostgreSQL -sudo -u git -H bundle install --without development test mysql --with postgres --deployment +sudo -u git -H bundle install --without development test mysql --deployment # MySQL -sudo -u git -H bundle install --without development test postgres --with mysql --deployment +sudo -u git -H bundle install --without development test postgres --deployment # Optional: clean up old gems sudo -u git -H bundle clean |