diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-09 21:13:03 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-09 21:13:03 +0300 |
commit | 519f46346b22c1b7c1f4c2a4ce902e829354cb62 (patch) | |
tree | 568e97ac17a509445e9e6cf926ebaf47beeba9fb /spec/features/merge_request/user_locks_discussion_spec.rb | |
parent | 07f3c9525c1df3ae1da995ea4fe6dd66bb61b9fd (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/merge_request/user_locks_discussion_spec.rb')
-rw-r--r-- | spec/features/merge_request/user_locks_discussion_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_request/user_locks_discussion_spec.rb b/spec/features/merge_request/user_locks_discussion_spec.rb index a603a5c1e0b..d4cc6c9410c 100644 --- a/spec/features/merge_request/user_locks_discussion_spec.rb +++ b/spec/features/merge_request/user_locks_discussion_spec.rb @@ -43,7 +43,7 @@ RSpec.describe 'Merge request > User locks discussion', :js, feature_category: : page.within('.js-vue-notes-event') do expect(page).not_to have_selector('js-main-target-form') expect(page.find('.issuable-note-warning')) - .to have_content('This merge request is locked. Only project members can comment.') + .to have_content('The discussion in this merge request is locked. Only project members can comment.') end end end |