Automatic merge of gitlab-org/gitlab-ce master

lib/feature/gitaly.rb

@@ -8,7 +8,12 @@ class Feature
     # CATFILE_CACHE sets an incorrect example
     CATFILE_CACHE = 'catfile-cache'.freeze
 
-    SERVER_FEATURE_FLAGS = [CATFILE_CACHE].freeze
+    SERVER_FEATURE_FLAGS =
+      [
+        CATFILE_CACHE,
+        'get_commit_signatures'.freeze
+      ].freeze
+
     DEFAULT_ON_FLAGS = Set.new([CATFILE_CACHE]).freeze
 
     class << self

spec/models/appearance_spec.rb

@@ -21,7 +21,7 @@ describe Appearance do
     end
   end
 
-  context 'with uploads' do
+  context 'with uploads', :quarantine do
     it_behaves_like 'model with uploads', false do
       let(:model_object) { create(:appearance, :with_logo) }
       let(:upload_attribute) { :logo }