Download as
Browse Code »

Commit 0955a45a53e206087f0dcc10fd5b41450c37b4c9

Authored by Dmitriy Zaporozhets
2 parents 5cc830d3 03e0a759
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge branch 'database-confusion' into 'master' 

Database Confusion

To prevent https://twitter.com/TechIsCool/status/426133762032676865
Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
doc/update/6.0-to-6.5.md
  Diff comments   View file @0955a45
@@ -53,10 +53,10 @@ sudo -u git -H git checkout v1.8.0 # Addresses multiple critical security vulner @@ -53,10 +53,10 @@ sudo -u git -H git checkout v1.8.0 # Addresses multiple critical security vulner
53 ```bash 53 ```bash
54 cd /home/git/gitlab 54 cd /home/git/gitlab
55 55
56 -# MySQL 56 +# MySQL installations (note: the line below states '--without ... postgres')
57 sudo -u git -H bundle install --without development test postgres --deployment 57 sudo -u git -H bundle install --without development test postgres --deployment
58 58
59 -#PostgreSQL 59 +# PostgreSQL installations (note: the line below states '--without ... mysql')
60 sudo -u git -H bundle install --without development test mysql --deployment 60 sudo -u git -H bundle install --without development test mysql --deployment
61 61
62 62
doc/update/6.4-to-6.5.md
  Diff comments   View file @0955a45
@@ -33,10 +33,10 @@ sudo -u git -H git checkout v1.8.0 @@ -33,10 +33,10 @@ sudo -u git -H git checkout v1.8.0
33 ```bash 33 ```bash
34 cd /home/git/gitlab 34 cd /home/git/gitlab
35 35
36 -# MySQL 36 +# MySQL installations (note: the line below states '--without ... postgres')
37 sudo -u git -H bundle install --without development test postgres --deployment 37 sudo -u git -H bundle install --without development test postgres --deployment
38 38
39 -# PostgreSQL 39 +# PostgreSQL installations (note: the line below states '--without ... mysql')
40 sudo -u git -H bundle install --without development test mysql --deployment 40 sudo -u git -H bundle install --without development test mysql --deployment
41 41
42 42