summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-09-15 17:43:46 +0000
committerRobert Speicher <robert@gitlab.com>2015-09-15 17:43:46 +0000
commit238365175f384d7fd1ef433d3a7908c7e4d9fd1d (patch)
tree982e0260ea4c9f8767788461649aa80d271f9b38
parent77e499ed1c1af3e30c937e13d4fb64283cb44ea8 (diff)
parentf01aaba778a908ea3bc8ae5438547083e1196b14 (diff)
downloadgitlab-ce-238365175f384d7fd1ef433d3a7908c7e4d9fd1d.tar.gz
Merge branch 'rs-update-guide' into 'master'
Reorder the `--without` arugments so the database comes first Hopefully this will make it a bit clearer that we're excluding a certain database type. [ci skip] See merge request !1301
-rw-r--r--doc/update/7.14-to-8.0.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/update/7.14-to-8.0.md b/doc/update/7.14-to-8.0.md
index e3d131d3227..3ae0f9616ac 100644
--- a/doc/update/7.14-to-8.0.md
+++ b/doc/update/7.14-to-8.0.md
@@ -96,11 +96,11 @@ See `lib/support/init.d/gitlab.default.example` for the options.
```bash
cd /home/git/gitlab
-# MySQL installations (note: the line below states '--without ... postgres')
-sudo -u git -H bundle install --without development test postgres --deployment
+# MySQL installations (note: the line below states '--without postgres')
+sudo -u git -H bundle install --without postgres development test --deployment
-# PostgreSQL installations (note: the line below states '--without ... mysql')
-sudo -u git -H bundle install --without development test mysql --deployment
+# PostgreSQL installations (note: the line below states '--without mysql')
+sudo -u git -H bundle install --without mysql development test --deployment
# Run database migrations
sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production