[ci skip] Merge branch 'master' into fl-update-registry-codefl-update-registry-code

* master: (68 commits)
  Render calendar feed inline when accessed from GitLab
  Make Gitaly wiki RPC's mandatory
  Remove the ci_job_request_with_tags_matcher
  Optimised paused runners to not re-query every 3s
  [Rails5] Set request.format for artifacts_controller
  [Rails5] Fix sessions_controller_spec
  Rails5 update Gemfile.rails5.lock
  [Rails5] Fix pipeline_schedules_controller_spec
  Fix milestones disappearing when changed on MR
  Harmonize theme preferences previews
  Resolve "Wiki git clone holder and dropdown is broken"
  Resolve "Update link in GitLab cluster setup form to say "see pricing""
  Resolve "Misalignment in rows on comparison page"
  Resolve "Stop horizontal scrolling when clicking on board issue"
  Enable no-multi-assignment in JS files
  Fix ci mini graph dropdown alignment and positioning
  Remove additional border from the create project page
  Fix alert colors
  Enable display static for ci job dropdowns so that they dont move when window resizes
  Remove pointer events in favor of boundary viewport
  ...

4 files changed, 157 insertions, 112 deletions

diff --git a/spec/lib/gitlab/favicon_spec.rb b/spec/lib/gitlab/favicon_spec.rb
index 08c4a474217..f36111a4946 100644
--- a/spec/lib/gitlab/favicon_spec.rb
+++ b/spec/lib/gitlab/favicon_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe Gitlab::Favicon, :request_store do
 
     it 'uses the custom favicon if a favicon appearance is present' do
       create :appearance, favicon: fixture_file_upload('spec/fixtures/dk.png')
-      expect(described_class.main).to match %r{/uploads/-/system/appearance/favicon/\d+/favicon_main_dk.png}
+      expect(described_class.main).to match %r{/uploads/-/system/appearance/favicon/\d+/dk.png}
     end
   end
 
diff --git a/spec/lib/gitlab/git/committer_with_hooks_spec.rb b/spec/lib/gitlab/git/committer_with_hooks_spec.rb
index 267056b96e6..2100690f873 100644
--- a/spec/lib/gitlab/git/committer_with_hooks_spec.rb
+++ b/spec/lib/gitlab/git/committer_with_hooks_spec.rb
@@ -1,154 +1,156 @@
 require 'spec_helper'
 
 describe Gitlab::Git::CommitterWithHooks, seed_helper: true do
-  shared_examples 'calling wiki hooks' do
-    let(:project) { create(:project) }
-    let(:user) { project.owner }
-    let(:project_wiki) { ProjectWiki.new(project, user) }
-    let(:wiki) { project_wiki.wiki }
-    let(:options) do
-      {
-        id: user.id,
-        username: user.username,
-        name: user.name,
-        email: user.email,
-        message: 'commit message'
-      }
-    end
-
-    subject { described_class.new(wiki, options) }
+  # TODO https://gitlab.com/gitlab-org/gitaly/issues/1234
+  skip 'needs to be moved to gitaly-ruby test suite' do
+    shared_examples 'calling wiki hooks' do
+      let(:project) { create(:project) }
+      let(:user) { project.owner }
+      let(:project_wiki) { ProjectWiki.new(project, user) }
+      let(:wiki) { project_wiki.wiki }
+      let(:options) do
+        {
+          id: user.id,
+          username: user.username,
+          name: user.name,
+          email: user.email,
+          message: 'commit message'
+        }
+      end
 
-    before do
-      project_wiki.create_page('home', 'test content')
-    end
+      subject { described_class.new(wiki, options) }
 
-    shared_examples 'failing pre-receive hook' do
       before do
-        expect_any_instance_of(Gitlab::Git::HooksService).to receive(:run_hook).with('pre-receive').and_return([false, ''])
-        expect_any_instance_of(Gitlab::Git::HooksService).not_to receive(:run_hook).with('update')
-        expect_any_instance_of(Gitlab::Git::HooksService).not_to receive(:run_hook).with('post-receive')
+        project_wiki.create_page('home', 'test content')
       end
 
-      it 'raises exception' do
-        expect { subject.commit }.to raise_error(Gitlab::Git::Wiki::OperationError)
-      end
+      shared_examples 'failing pre-receive hook' do
+        before do
+          expect_any_instance_of(Gitlab::Git::HooksService).to receive(:run_hook).with('pre-receive').and_return([false, ''])
+          expect_any_instance_of(Gitlab::Git::HooksService).not_to receive(:run_hook).with('update')
+          expect_any_instance_of(Gitlab::Git::HooksService).not_to receive(:run_hook).with('post-receive')
+        end
 
-      it 'does not create a new commit inside the repository' do
-        current_rev = find_current_rev
+        it 'raises exception' do
+          expect { subject.commit }.to raise_error(Gitlab::Git::Wiki::OperationError)
+        end
 
-        expect { subject.commit }.to raise_error(Gitlab::Git::Wiki::OperationError)
+        it 'does not create a new commit inside the repository' do
+          current_rev = find_current_rev
 
-        expect(current_rev).to eq find_current_rev
-      end
-    end
+          expect { subject.commit }.to raise_error(Gitlab::Git::Wiki::OperationError)
 
-    shared_examples 'failing update hook' do
-      before do
-        expect_any_instance_of(Gitlab::Git::HooksService).to receive(:run_hook).with('pre-receive').and_return([true, ''])
-        expect_any_instance_of(Gitlab::Git::HooksService).to receive(:run_hook).with('update').and_return([false, ''])
-        expect_any_instance_of(Gitlab::Git::HooksService).not_to receive(:run_hook).with('post-receive')
+          expect(current_rev).to eq find_current_rev
+        end
       end
 
-      it 'raises exception' do
-        expect { subject.commit }.to raise_error(Gitlab::Git::Wiki::OperationError)
-      end
+      shared_examples 'failing update hook' do
+        before do
+          expect_any_instance_of(Gitlab::Git::HooksService).to receive(:run_hook).with('pre-receive').and_return([true, ''])
+          expect_any_instance_of(Gitlab::Git::HooksService).to receive(:run_hook).with('update').and_return([false, ''])
+          expect_any_instance_of(Gitlab::Git::HooksService).not_to receive(:run_hook).with('post-receive')
+        end
 
-      it 'does not create a new commit inside the repository' do
-        current_rev = find_current_rev
+        it 'raises exception' do
+          expect { subject.commit }.to raise_error(Gitlab::Git::Wiki::OperationError)
+        end
 
-        expect { subject.commit }.to raise_error(Gitlab::Git::Wiki::OperationError)
+        it 'does not create a new commit inside the repository' do
+          current_rev = find_current_rev
 
-        expect(current_rev).to eq find_current_rev
-      end
-    end
+          expect { subject.commit }.to raise_error(Gitlab::Git::Wiki::OperationError)
 
-    shared_examples 'failing post-receive hook' do
-      before do
-        expect_any_instance_of(Gitlab::Git::HooksService).to receive(:run_hook).with('pre-receive').and_return([true, ''])
-        expect_any_instance_of(Gitlab::Git::HooksService).to receive(:run_hook).with('update').and_return([true, ''])
-        expect_any_instance_of(Gitlab::Git::HooksService).to receive(:run_hook).with('post-receive').and_return([false, ''])
+          expect(current_rev).to eq find_current_rev
+        end
       end
 
-      it 'does not raise exception' do
-        expect { subject.commit }.not_to raise_error
-      end
+      shared_examples 'failing post-receive hook' do
+        before do
+          expect_any_instance_of(Gitlab::Git::HooksService).to receive(:run_hook).with('pre-receive').and_return([true, ''])
+          expect_any_instance_of(Gitlab::Git::HooksService).to receive(:run_hook).with('update').and_return([true, ''])
+          expect_any_instance_of(Gitlab::Git::HooksService).to receive(:run_hook).with('post-receive').and_return([false, ''])
+        end
+
+        it 'does not raise exception' do
+          expect { subject.commit }.not_to raise_error
+        end
 
-      it 'creates the commit' do
-        current_rev = find_current_rev
+        it 'creates the commit' do
+          current_rev = find_current_rev
 
-        subject.commit
+          subject.commit
 
-        expect(current_rev).not_to eq find_current_rev
+          expect(current_rev).not_to eq find_current_rev
+        end
       end
-    end
 
-    shared_examples 'when hooks call succceeds' do
-      let(:hook) { double(:hook) }
+      shared_examples 'when hooks call succceeds' do
+        let(:hook) { double(:hook) }
 
-      it 'calls the three hooks' do
-        expect(Gitlab::Git::Hook).to receive(:new).exactly(3).times.and_return(hook)
-        expect(hook).to receive(:trigger).exactly(3).times.and_return([true, nil])
+        it 'calls the three hooks' do
+          expect(Gitlab::Git::Hook).to receive(:new).exactly(3).times.and_return(hook)
+          expect(hook).to receive(:trigger).exactly(3).times.and_return([true, nil])
 
-        subject.commit
-      end
+          subject.commit
+        end
 
-      it 'creates the commit' do
-        current_rev = find_current_rev
+        it 'creates the commit' do
+          current_rev = find_current_rev
 
-        subject.commit
+          subject.commit
 
-        expect(current_rev).not_to eq find_current_rev
+          expect(current_rev).not_to eq find_current_rev
+        end
       end
-    end
 
-    context 'when creating a page' do
-      before do
-        project_wiki.create_page('index', 'test content')
+      context 'when creating a page' do
+        before do
+          project_wiki.create_page('index', 'test content')
+        end
+
+        it_behaves_like 'failing pre-receive hook'
+        it_behaves_like 'failing update hook'
+        it_behaves_like 'failing post-receive hook'
+        it_behaves_like 'when hooks call succceeds'
       end
 
-      it_behaves_like 'failing pre-receive hook'
-      it_behaves_like 'failing update hook'
-      it_behaves_like 'failing post-receive hook'
-      it_behaves_like 'when hooks call succceeds'
-    end
+      context 'when updating a page' do
+        before do
+          project_wiki.update_page(find_page('home'), content: 'some other content', format: :markdown)
+        end
 
-    context 'when updating a page' do
-      before do
-        project_wiki.update_page(find_page('home'), content: 'some other content', format: :markdown)
+        it_behaves_like 'failing pre-receive hook'
+        it_behaves_like 'failing update hook'
+        it_behaves_like 'failing post-receive hook'
+        it_behaves_like 'when hooks call succceeds'
       end
 
-      it_behaves_like 'failing pre-receive hook'
-      it_behaves_like 'failing update hook'
-      it_behaves_like 'failing post-receive hook'
-      it_behaves_like 'when hooks call succceeds'
-    end
+      context 'when deleting a page' do
+        before do
+          project_wiki.delete_page(find_page('home'))
+        end
 
-    context 'when deleting a page' do
-      before do
-        project_wiki.delete_page(find_page('home'))
+        it_behaves_like 'failing pre-receive hook'
+        it_behaves_like 'failing update hook'
+        it_behaves_like 'failing post-receive hook'
+        it_behaves_like 'when hooks call succceeds'
       end
 
-      it_behaves_like 'failing pre-receive hook'
-      it_behaves_like 'failing update hook'
-      it_behaves_like 'failing post-receive hook'
-      it_behaves_like 'when hooks call succceeds'
-    end
+      def find_current_rev
+        wiki.gollum_wiki.repo.commits.first&.sha
+      end
 
-    def find_current_rev
-      wiki.gollum_wiki.repo.commits.first&.sha
+      def find_page(name)
+        wiki.page(title: name)
+      end
     end
 
-    def find_page(name)
-      wiki.page(title: name)
+    context 'when Gitaly is enabled' do
+      it_behaves_like 'calling wiki hooks'
     end
-  end
-
-  # TODO: Uncomment once Gitaly updates the ruby vendor code
-  # context 'when Gitaly is enabled' do
-  #   it_behaves_like 'calling wiki hooks'
-  # end
 
-  context 'when Gitaly is disabled', :skip_gitaly_mock do
-    it_behaves_like 'calling wiki hooks'
+    context 'when Gitaly is disabled', :disable_gitaly do
+      it_behaves_like 'calling wiki hooks'
+    end
   end
 end
diff --git a/spec/lib/gitlab/git/wiki_spec.rb b/spec/lib/gitlab/git/wiki_spec.rb
index 35b06b14620..b63658e1b3b 100644
--- a/spec/lib/gitlab/git/wiki_spec.rb
+++ b/spec/lib/gitlab/git/wiki_spec.rb
@@ -6,9 +6,7 @@ describe Gitlab::Git::Wiki do
   let(:project_wiki) { ProjectWiki.new(project, user) }
   subject { project_wiki.wiki }
 
-  # Remove skip_gitaly_mock flag when gitaly_find_page when
-  # https://gitlab.com/gitlab-org/gitlab-ce/issues/42039 is solved
-  describe '#page', :skip_gitaly_mock do
+  describe '#page' do
     before do
       create_page('page1', 'content')
       create_page('foo/page1', 'content foo/page1')
@@ -25,7 +23,7 @@ describe Gitlab::Git::Wiki do
     end
   end
 
-  describe '#delete_page', :skip_gitaly_mock do
+  describe '#delete_page' do
     after do
       destroy_page('page1')
     end
diff --git a/spec/lib/gitlab/profiler_spec.rb b/spec/lib/gitlab/profiler_spec.rb
index 548eb28fe4d..4059188fba1 100644
--- a/spec/lib/gitlab/profiler_spec.rb
+++ b/spec/lib/gitlab/profiler_spec.rb
@@ -135,6 +135,51 @@ describe Gitlab::Profiler do
     end
   end
 
+  describe '.clean_backtrace' do
+    it 'uses the Rails backtrace cleaner' do
+      backtrace = []
+
+      expect(Rails.backtrace_cleaner).to receive(:clean).with(backtrace)
+
+      described_class.clean_backtrace(backtrace)
+    end
+
+    it 'removes lines from IGNORE_BACKTRACES' do
+      backtrace = [
+        "lib/gitlab/gitaly_client.rb:294:in `block (2 levels) in migrate'",
+        "lib/gitlab/gitaly_client.rb:331:in `allow_n_plus_1_calls'",
+        "lib/gitlab/gitaly_client.rb:280:in `block in migrate'",
+        "lib/gitlab/metrics/influx_db.rb:103:in `measure'",
+        "lib/gitlab/gitaly_client.rb:278:in `migrate'",
+        "lib/gitlab/git/repository.rb:1451:in `gitaly_migrate'",
+        "lib/gitlab/git/commit.rb:66:in `find'",
+        "app/models/repository.rb:1047:in `find_commit'",
+        "lib/gitlab/metrics/instrumentation.rb:159:in `block in find_commit'",
+        "lib/gitlab/metrics/method_call.rb:36:in `measure'",
+        "lib/gitlab/metrics/instrumentation.rb:159:in `find_commit'",
+        "app/models/repository.rb:113:in `commit'",
+        "lib/gitlab/i18n.rb:50:in `with_locale'",
+        "lib/gitlab/middleware/multipart.rb:95:in `call'",
+        "lib/gitlab/request_profiler/middleware.rb:14:in `call'",
+        "ee/lib/gitlab/database/load_balancing/rack_middleware.rb:37:in `call'",
+        "ee/lib/gitlab/jira/middleware.rb:15:in `call'"
+      ]
+
+      expect(described_class.clean_backtrace(backtrace))
+        .to eq([
+                 "lib/gitlab/gitaly_client.rb:294:in `block (2 levels) in migrate'",
+                 "lib/gitlab/gitaly_client.rb:331:in `allow_n_plus_1_calls'",
+                 "lib/gitlab/gitaly_client.rb:280:in `block in migrate'",
+                 "lib/gitlab/gitaly_client.rb:278:in `migrate'",
+                 "lib/gitlab/git/repository.rb:1451:in `gitaly_migrate'",
+                 "lib/gitlab/git/commit.rb:66:in `find'",
+                 "app/models/repository.rb:1047:in `find_commit'",
+                 "app/models/repository.rb:113:in `commit'",
+                 "ee/lib/gitlab/jira/middleware.rb:15:in `call'"
+               ])
+    end
+  end
+
   describe '.with_custom_logger' do
     context 'when the logger is set' do
       it 'uses the replacement logger for the duration of the block' do