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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
144d2919
Commit
144d2919
authored
Sep 08, 2015
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Extend approvals permissions for guests and reporters
parent
a9f92209
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
2 deletions
+27
-2
CHANGELOG-EE
CHANGELOG-EE
+1
-0
app/views/projects/merge_requests/widget/_open.html.haml
app/views/projects/merge_requests/widget/_open.html.haml
+2
-2
features/project/merge_requests.feature
features/project/merge_requests.feature
+9
-0
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+15
-0
No files found.
CHANGELOG-EE
View file @
144d2919
v 8.0.0 (unreleased)
- Fix navigation issue when viewing Group Settings pages
- Guests and Reporters can approve merge request as well
v 7.14.0
- Disable adding, updating and removing members from a group that is synced with LDAP
...
...
app/views/projects/merge_requests/widget/_open.html.haml
View file @
144d2919
...
...
@@ -13,10 +13,10 @@
=
render
'projects/merge_requests/widget/open/conflicts'
-
elsif
@merge_request
.
work_in_progress?
=
render
'projects/merge_requests/widget/open/wip'
-
elsif
!
@merge_request
.
can_be_merged_by?
(
current_user
)
=
render
'projects/merge_requests/widget/open/not_allowed'
-
elsif
@merge_request
.
requires_approve?
&&
!
@merge_request
.
approved?
=
render
'projects/merge_requests/widget/open/approve'
-
elsif
!
@merge_request
.
can_be_merged_by?
(
current_user
)
=
render
'projects/merge_requests/widget/open/not_allowed'
-
elsif
@merge_request
.
can_be_merged?
=
render
'projects/merge_requests/widget/open/accept'
...
...
features/project/merge_requests.feature
View file @
144d2919
...
...
@@ -240,6 +240,15 @@ Feature: Project Merge Requests
When
I click link
"Approve"
Then
I should see approved merge request
"Bug NS-04"
Scenario
:
Reporter can approve merge request
Given
I am a
"Shop"
reporter
And
I visit project
"Shop"
merge requests page
And
merge request 'Bug NS-04' must be approved
And
I click link
"Bug NS-04"
And
I should not see merge button
When
I click link
"Approve"
Then
I should see message that merge request can be merged
Scenario
:
I
approve merge request if I am an approver
Given
merge request 'Bug NS-04' must be approved by current user
And
I click link
"Bug NS-04"
...
...
features/steps/project/merge_requests.rb
View file @
144d2919
...
...
@@ -420,6 +420,12 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end
end
step
'I should see message that merge request can be merged'
do
page
.
within
'.mr-state-widget'
do
expect
(
page
).
to
have_content
(
"Ready to be merged automatically"
)
end
end
step
'I should see message that MR require an approval from me'
do
page
.
within
'.mr-state-widget'
do
expect
(
page
).
to
have_content
(
"Requires one more approval (from
#{
current_user
.
name
}
)"
)
...
...
@@ -454,6 +460,15 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
expect
(
page
).
to
have_content
(
'diff --git'
)
end
step
'I am a "Shop" reporter'
do
user
=
create
(
:user
,
name:
"Mike"
)
project
=
Project
.
find_by
(
name:
"Shop"
)
project
.
team
<<
[
user
,
:reporter
]
logout
login_with
user
end
def
merge_request
@merge_request
||=
MergeRequest
.
find_by!
(
title:
"Bug NS-05"
)
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