Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 36 deletions

diff --git a/spec/presenters/blob_presenter_spec.rb b/spec/presenters/blob_presenter_spec.rb
index 7e5a6b8b86e..f8cba8e9203 100644
--- a/spec/presenters/blob_presenter_spec.rb
+++ b/spec/presenters/blob_presenter_spec.rb
@@ -31,32 +31,6 @@ RSpec.describe BlobPresenter do
     it { expect(presenter.replace_path).to eq("/#{project.full_path}/-/update/#{blob.commit_id}/#{blob.path}") }
   end
 
-  context 'when blob has ref_type' do
-    before do
-      blob.ref_type = 'heads'
-    end
-
-    describe '#web_url' do
-      it { expect(presenter.web_url).to eq("http://localhost/#{project.full_path}/-/blob/#{blob.commit_id}/#{blob.path}?ref_type=heads") }
-    end
-
-    describe '#web_path' do
-      it { expect(presenter.web_path).to eq("/#{project.full_path}/-/blob/#{blob.commit_id}/#{blob.path}?ref_type=heads") }
-    end
-
-    describe '#edit_blob_path' do
-      it { expect(presenter.edit_blob_path).to eq("/#{project.full_path}/-/edit/#{blob.commit_id}/#{blob.path}?ref_type=heads") }
-    end
-
-    describe '#raw_path' do
-      it { expect(presenter.raw_path).to eq("/#{project.full_path}/-/raw/#{blob.commit_id}/#{blob.path}?ref_type=heads") }
-    end
-
-    describe '#replace_path' do
-      it { expect(presenter.replace_path).to eq("/#{project.full_path}/-/update/#{blob.commit_id}/#{blob.path}?ref_type=heads") }
-    end
-  end
-
   describe '#can_current_user_push_to_branch' do
     let(:branch_exists) { true }
 
diff --git a/spec/presenters/ci/build_runner_presenter_spec.rb b/spec/presenters/ci/build_runner_presenter_spec.rb
index 952de121cc4..733b6e87087 100644
--- a/spec/presenters/ci/build_runner_presenter_spec.rb
+++ b/spec/presenters/ci/build_runner_presenter_spec.rb
@@ -349,16 +349,6 @@ RSpec.describe Ci::BuildRunnerPresenter do
             public: false, masked: false }
         )
       end
-
-      it 'logs file_variable_is_referenced_in_another_variable' do
-        expect(Gitlab::AppJsonLogger).to receive(:info).with(
-          event: 'file_variable_is_referenced_in_another_variable',
-          project_id: project.id,
-          variable: 'file_var'
-        ).once
-
-        runner_variables
-      end
     end
 
     context 'when there is a raw variable to expand' do