Add latest changes from gitlab-org/gitlab@master

2 files changed, 1 insertions, 40 deletions

diff --git a/spec/views/projects/merge_requests/diffs/_diffs.html.haml_spec.rb b/spec/views/projects/merge_requests/diffs/_diffs.html.haml_spec.rb
deleted file mode 100644
index 7cdc817d784..00000000000
--- a/spec/views/projects/merge_requests/diffs/_diffs.html.haml_spec.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe 'projects/merge_requests/diffs/_diffs.html.haml' do
-  include Devise::Test::ControllerHelpers
-
-  let(:user) { create(:user) }
-  let(:project) { create(:project, :public, :repository) }
-  let(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project, author: user) }
-
-  before do
-    allow(view).to receive(:url_for).and_return(controller.request.fullpath)
-
-    assign(:merge_request, merge_request)
-    assign(:environment, merge_request.environments_for(user).last)
-    assign(:diffs, merge_request.diffs)
-    assign(:merge_request_diffs, merge_request.diffs)
-    assign(:diff_notes_disabled, true) # disable note creation
-    assign(:use_legacy_diff_notes, false)
-    assign(:grouped_diff_discussions, {})
-    assign(:notes, [])
-  end
-
-  context 'for a commit' do
-    let(:commit) { merge_request.commits.last }
-
-    before do
-      assign(:commit, commit)
-    end
-
-    it "shows the commit scope" do
-      render
-
-      expect(rendered).to have_content "Only comments from the following commit are shown below"
-    end
-  end
-end
diff --git a/spec/views/shared/milestones/_issuables.html.haml_spec.rb b/spec/views/shared/milestones/_issuables.html.haml_spec.rb
index 70ab6914580..5eed2c96a45 100644
--- a/spec/views/shared/milestones/_issuables.html.haml_spec.rb
+++ b/spec/views/shared/milestones/_issuables.html.haml_spec.rb
@@ -6,8 +6,7 @@ RSpec.describe 'shared/milestones/_issuables.html.haml' do
   let(:issuables_size) { 100 }
 
   before do
-    allow(view).to receive_messages(title: nil, id: nil, show_project_name: nil,
-                                    show_full_project_name: nil, dom_class: '',
+    allow(view).to receive_messages(title: nil, id: nil, show_project_name: nil, dom_class: '',
                                     issuables: double(length: issuables_size).as_null_object)
 
     stub_template 'shared/milestones/_issuable.html.haml' => ''