summaryrefslogtreecommitdiff
path: root/spec/features/merge_request/user_views_open_merge_request_spec.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-05-19 15:44:42 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-05-19 15:44:42 +0000
commit4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch)
tree5423a1c7516cffe36384133ade12572cf709398d /spec/features/merge_request/user_views_open_merge_request_spec.rb
parente570267f2f6b326480d284e0164a6464ba4081bc (diff)
downloadgitlab-ce-4555e1b21c365ed8303ffb7a3325d773c9b8bf31.tar.gz
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'spec/features/merge_request/user_views_open_merge_request_spec.rb')
-rw-r--r--spec/features/merge_request/user_views_open_merge_request_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_request/user_views_open_merge_request_spec.rb b/spec/features/merge_request/user_views_open_merge_request_spec.rb
index f1b44010f63..073706cf9d8 100644
--- a/spec/features/merge_request/user_views_open_merge_request_spec.rb
+++ b/spec/features/merge_request/user_views_open_merge_request_spec.rb
@@ -76,7 +76,7 @@ RSpec.describe 'User views an open merge request' do
it 'does not show diverged commits count' do
page.within('.mr-source-target') do
- expect(page).not_to have_content(/([0-9]+ commit[s]? behind)/)
+ expect(page).not_to have_content(/([0-9]+ commits? behind)/)
end
end
end