diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-25 13:49:48 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-25 13:49:48 +0400 |
| commit | 0955a45a53e206087f0dcc10fd5b41450c37b4c9 (patch) | |
| tree | bd92d34b2a32e7513588991181eae52dec1f0640 /doc | |
| parent | 5cc830d3db1565492584021deebe749a545e6c0d (diff) | |
| parent | 03e0a759af4decaad1b0a5fc2ae60a2e447ea067 (diff) | |
Merge branch 'database-confusion' into 'master'
Database Confusion
To prevent https://twitter.com/TechIsCool/status/426133762032676865
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/update/6.0-to-6.5.md | 4 | ||||
| -rw-r--r-- | doc/update/6.4-to-6.5.md | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/update/6.0-to-6.5.md b/doc/update/6.0-to-6.5.md index 8b2fcd4854b..e01cc589a83 100644 --- a/doc/update/6.0-to-6.5.md +++ b/doc/update/6.0-to-6.5.md @@ -53,10 +53,10 @@ sudo -u git -H git checkout v1.8.0 # Addresses multiple critical security vulner ```bash cd /home/git/gitlab -# MySQL +# MySQL installations (note: the line below states '--without ... postgres') sudo -u git -H bundle install --without development test postgres --deployment -#PostgreSQL +# PostgreSQL installations (note: the line below states '--without ... mysql') sudo -u git -H bundle install --without development test mysql --deployment diff --git a/doc/update/6.4-to-6.5.md b/doc/update/6.4-to-6.5.md index 43bc20ec6b0..5dcfd15fe1e 100644 --- a/doc/update/6.4-to-6.5.md +++ b/doc/update/6.4-to-6.5.md @@ -33,10 +33,10 @@ sudo -u git -H git checkout v1.8.0 ```bash cd /home/git/gitlab -# MySQL +# MySQL installations (note: the line below states '--without ... postgres') sudo -u git -H bundle install --without development test postgres --deployment -# PostgreSQL +# PostgreSQL installations (note: the line below states '--without ... mysql') sudo -u git -H bundle install --without development test mysql --deployment |