diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
| commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
| tree | c8f718a08e110ad7e1894510980d2155a6549197 /spec/views/projects/merge_requests/show.html.haml_spec.rb | |
| parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'spec/views/projects/merge_requests/show.html.haml_spec.rb')
| -rw-r--r-- | spec/views/projects/merge_requests/show.html.haml_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/views/projects/merge_requests/show.html.haml_spec.rb b/spec/views/projects/merge_requests/show.html.haml_spec.rb index 1acc07dabb6..9b4f2774c5b 100644 --- a/spec/views/projects/merge_requests/show.html.haml_spec.rb +++ b/spec/views/projects/merge_requests/show.html.haml_spec.rb @@ -18,7 +18,7 @@ RSpec.describe 'projects/merge_requests/show.html.haml' do render - expect(rendered).not_to have_css('.cannot-be-merged') + expect(rendered).not_to have_css('.merge-icon') end end end |