diff options
| author | Mark Chao <mchao@gitlab.com> | 2018-07-11 14:36:08 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-07-11 14:36:08 +0000 |
| commit | a63bce1a4b55bc6cbafb9dec12d33028521489e9 (patch) | |
| tree | ee9466e6b06536a65d4e851f4096679c6f968d1e /spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb | |
| parent | 1bf54e092783f7ad388225d32ab79ac1e845559c (diff) | |
| download | gitlab-ce-a63bce1a4b55bc6cbafb9dec12d33028521489e9.tar.gz | |
Resolve "Rename the `Master` role to `Maintainer`" Backend
Diffstat (limited to 'spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb')
| -rw-r--r-- | spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb index a0b9d6cb059..bf4d5396df9 100644 --- a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb +++ b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb @@ -19,7 +19,7 @@ describe 'Merge request > User resolves diff notes and discussions', :js do context 'no discussions' do before do - project.add_master(user) + project.add_maintainer(user) sign_in(user) note.destroy visit_merge_request @@ -33,7 +33,7 @@ describe 'Merge request > User resolves diff notes and discussions', :js do context 'as authorized user' do before do - project.add_master(user) + project.add_maintainer(user) sign_in(user) visit_merge_request end |