Commit 58e4e6b0819fcb385d790671d44c7a5051787e92

Authored by Dmitriy Zaporozhets
2 parents 8839339e cad79433

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

doc/install/installation.md
... ... @@ -144,7 +144,7 @@ GitLab Shell is an ssh access and repository management software developed speci
144 144  
145 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 149 # Install the database packages
150 150 sudo apt-get install -y postgresql-9.1 postgresql-client libpq-dev
... ...
spec/support/test_env.rb
... ... @@ -106,7 +106,7 @@ module TestEnv
106 106 setup_stubs
107 107 [
108 108 %W(git reset --hard --quiet),
109   - %W(git clean -fx),
  109 + %W(git clean -fx --quiet),
110 110 %W(git checkout --quiet origin/master)
111 111 ].each do |git_cmd|
112 112 system(*git_cmd, chdir: seed_satellite_path)
... ...