kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'revert-3955' into 'master'

Browse source 
Revert "Merge branch 'doc-fix-db-gem-install-instructions' into 'master'"

This reverts commit 66d8ef1ad9, reversing
changes made to 6a8359f3d3.

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
66d8ef1ad9
for more context.

See merge request !4144
This commit is contained in:
Achilleas Pipinellis 2016-05-13 20:51:06 +00:00
commit d7a28f3c12
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/update/patch_versions.md
View file

@ -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