Download as
Browse Code »

Commit 58e4e6b0819fcb385d790671d44c7a5051787e92

Authored by Dmitriy Zaporozhets
2 parents 8839339e cad79433
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge branch 'master' of github.com:gitlabhq/gitlabhq

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
doc/install/installation.md
  Diff comments   View file @58e4e6b
@@ -144,7 +144,7 @@ GitLab Shell is an ssh access and repository management software developed speci @@ -144,7 +144,7 @@ GitLab Shell is an ssh access and repository management software developed speci
144 144
145 # 5. Database 145 # 5. Database
146 146
147 -We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](doc/install/database_mysql.md). 147 +We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](database_mysql.md).
148 148
149 # Install the database packages 149 # Install the database packages
150 sudo apt-get install -y postgresql-9.1 postgresql-client libpq-dev 150 sudo apt-get install -y postgresql-9.1 postgresql-client libpq-dev
spec/support/test_env.rb
  Diff comments   View file @58e4e6b
@@ -106,7 +106,7 @@ module TestEnv @@ -106,7 +106,7 @@ module TestEnv
106 setup_stubs 106 setup_stubs
107 [ 107 [
108 %W(git reset --hard --quiet), 108 %W(git reset --hard --quiet),
109 - %W(git clean -fx), 109 + %W(git clean -fx --quiet),
110 %W(git checkout --quiet origin/master) 110 %W(git checkout --quiet origin/master)
111 ].each do |git_cmd| 111 ].each do |git_cmd|
112 system(*git_cmd, chdir: seed_satellite_path) 112 system(*git_cmd, chdir: seed_satellite_path)