Add latest changes from gitlab-org/gitlab@13-3-stable-ee

2 files changed, 30 insertions, 1 deletions

diff --git a/spec/features/merge_requests/user_mass_updates_spec.rb b/spec/features/merge_requests/user_mass_updates_spec.rb
index df94fe2cbd0..179bf84a729 100644
--- a/spec/features/merge_requests/user_mass_updates_spec.rb
+++ b/spec/features/merge_requests/user_mass_updates_spec.rb
@@ -37,6 +37,15 @@ RSpec.describe 'Merge requests > User mass updates', :js do
         expect(page).to have_selector('.merge-request', count: 0)
       end
     end
+
+    it 'does not exist in merged state' do
+      merge_request.close
+      visit project_merge_requests_path(project, state: 'merged')
+
+      click_button 'Edit merge requests'
+
+      expect(page).not_to have_css('.js-issue-status')
+    end
   end
 
   context 'assignee' do
@@ -86,7 +95,7 @@ RSpec.describe 'Merge requests > User mass updates', :js do
     describe 'unset milestone' do
       before do
         merge_request.milestone = milestone
-        merge_request.save
+        merge_request.save!
         visit project_merge_requests_path(project)
       end
 
diff --git a/spec/features/merge_requests/user_views_diffs_commit_spec.rb b/spec/features/merge_requests/user_views_diffs_commit_spec.rb
new file mode 100644
index 00000000000..fcaabf9b0e7
--- /dev/null
+++ b/spec/features/merge_requests/user_views_diffs_commit_spec.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'User views diff by commit', :js do
+  let(:merge_request) do
+    create(:merge_request_with_diffs, source_project: project, target_project: project, source_branch: 'merge-test')
+  end
+
+  let(:project) { create(:project, :public, :repository) }
+
+  before do
+    stub_feature_flags(diffs_batch_load: false)
+    visit(diffs_project_merge_request_path(project, merge_request, commit_id: merge_request.diff_head_sha))
+  end
+
+  it 'shows full commit description by default' do
+    expect(page).to have_selector('.commit-row-description', visible: true)
+  end
+end