Commit d7a28f3c authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'revert-3955' into 'master'

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

This reverts commit 66d8ef1a, reversing
changes made to 6a8359f3.

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
parents 710ebf16 935c684a
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment