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
 
 # 5. Database
 
-We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](doc/install/database_mysql.md).
+We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](database_mysql.md).
 
     # Install the database packages
     sudo apt-get install -y postgresql-9.1 postgresql-client libpq-dev

spec/support/test_env.rb

@@ -106,7 +106,7 @@ module TestEnv
     setup_stubs
     [
       %W(git reset --hard --quiet),
-      %W(git clean -fx),
+      %W(git clean -fx --quiet),
       %W(git checkout --quiet origin/master)
     ].each do |git_cmd|
       system(*git_cmd, chdir: seed_satellite_path)