Merge branch 'gitaly-fix-broken-specs' into 'master'

skip_gitaly_mock disables Gitaly in specs

See merge request gitlab-org/gitlab-ce!15383

spec/support/gitaly.rb

 RSpec.configure do |config|
   config.before(:each) do |example|
-    next if example.metadata[:skip_gitaly_mock]
-    allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_return(true)
+    if example.metadata[:disable_gitaly]
+      allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_return(false)
+    else
+      next if example.metadata[:skip_gitaly_mock]
+      allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_return(true)
+    end
   end
 end