diff options
| author | Mark Chao <mchao@gitlab.com> | 2018-05-22 19:54:50 +0800 |
|---|---|---|
| committer | Mark Chao <mchao@gitlab.com> | 2018-06-06 20:57:15 +0900 |
| commit | cfcc7043fe614cbc5fc82f3021a0c4cd8519e24b (patch) | |
| tree | c00f507cb85b0beffb65c1af5a2c2d0eb35946e0 /qa | |
| parent | a8b570d8bced794dcb8f6f3a1155360038d76a66 (diff) | |
| download | gitlab-ce-cfcc7043fe614cbc5fc82f3021a0c4cd8519e24b.tar.gz | |
Rename “Developers + Masters”
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/qa/page/project/settings/protected_branches.rb | 4 | ||||
| -rw-r--r-- | qa/qa/specs/features/repository/protected_branches_spec.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qa/qa/page/project/settings/protected_branches.rb b/qa/qa/page/project/settings/protected_branches.rb index 63bc3aaa2bc..a0903c3c4dc 100644 --- a/qa/qa/page/project/settings/protected_branches.rb +++ b/qa/qa/page/project/settings/protected_branches.rb @@ -41,7 +41,7 @@ module QA end def allow_devs_and_masters_to_push - click_allow(:push, 'Developers + Masters') + click_allow(:push, 'Developers + Maintainers') end def allow_no_one_to_merge @@ -49,7 +49,7 @@ module QA end def allow_devs_and_masters_to_merge - click_allow(:merge, 'Developers + Masters') + click_allow(:merge, 'Developers + Maintainers') end def protect_branch diff --git a/qa/qa/specs/features/repository/protected_branches_spec.rb b/qa/qa/specs/features/repository/protected_branches_spec.rb index 406b2772b64..9e438aa3c30 100644 --- a/qa/qa/specs/features/repository/protected_branches_spec.rb +++ b/qa/qa/specs/features/repository/protected_branches_spec.rb @@ -35,7 +35,7 @@ module QA end expect(protected_branch.name).to have_content(branch_name) - expect(protected_branch.push_allowance).to have_content('Developers + Masters') + expect(protected_branch.push_allowance).to have_content('Developers + Maintainers') end scenario 'users without authorization cannot push to protected branch' do |