Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
d5f5d147
Commit
d5f5d147
authored
Jun 07, 2018
by
Michael Kozono
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename method according to new role name
parent
01400a08
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
qa/qa/factory/resource/branch.rb
qa/qa/factory/resource/branch.rb
+2
-2
qa/qa/page/project/settings/protected_branches.rb
qa/qa/page/project/settings/protected_branches.rb
+2
-2
No files found.
qa/qa/factory/resource/branch.rb
View file @
d5f5d147
...
@@ -64,13 +64,13 @@ module QA
...
@@ -64,13 +64,13 @@ module QA
page
.
select_branch
(
branch_name
)
page
.
select_branch
(
branch_name
)
if
allow_to_push
if
allow_to_push
page
.
allow_devs_and_ma
st
ers_to_push
page
.
allow_devs_and_ma
intain
ers_to_push
else
else
page
.
allow_no_one_to_push
page
.
allow_no_one_to_push
end
end
if
allow_to_merge
if
allow_to_merge
page
.
allow_devs_and_ma
st
ers_to_merge
page
.
allow_devs_and_ma
intain
ers_to_merge
else
else
page
.
allow_no_one_to_merge
page
.
allow_no_one_to_merge
end
end
...
...
qa/qa/page/project/settings/protected_branches.rb
View file @
d5f5d147
...
@@ -40,7 +40,7 @@ module QA
...
@@ -40,7 +40,7 @@ module QA
click_allow
(
:push
,
'No one'
)
click_allow
(
:push
,
'No one'
)
end
end
def
allow_devs_and_ma
st
ers_to_push
def
allow_devs_and_ma
intain
ers_to_push
click_allow
(
:push
,
'Developers + Maintainers'
)
click_allow
(
:push
,
'Developers + Maintainers'
)
end
end
...
@@ -48,7 +48,7 @@ module QA
...
@@ -48,7 +48,7 @@ module QA
click_allow
(
:merge
,
'No one'
)
click_allow
(
:merge
,
'No one'
)
end
end
def
allow_devs_and_ma
st
ers_to_merge
def
allow_devs_and_ma
intain
ers_to_merge
click_allow
(
:merge
,
'Developers + Maintainers'
)
click_allow
(
:merge
,
'Developers + Maintainers'
)
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment