Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
f96bf65775e9
Commit
9eca67c9
authored
Aug 10, 2016
by
Douwe Maan
Committed by
Fatih Acet
Aug 12, 2016
Browse files
Verify user is signed in and can actually resolve conflicts
parent
7147e9569534
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/controllers/projects/merge_requests_controller.rb
View file @
f96bf657
...
...
@@ -28,6 +28,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
# Allow modify merge_request
before_action
:authorize_update_merge_request!
,
only:
[
:close
,
:edit
,
:update
,
:remove_wip
,
:sort
]
before_action
:authorize_can_resolve_conflicts!
,
only:
[
:conflicts
,
:resolve_conflicts
]
def
index
terms
=
params
[
'issue_search'
]
@merge_requests
=
merge_requests_collection
...
...
@@ -368,6 +370,10 @@ def authorize_admin_merge_request!
return
render_404
unless
can?
(
current_user
,
:admin_merge_request
,
@merge_request
)
end
def
authorize_can_resolve_conflicts!
return
render_404
unless
@merge_request
.
conflicts_can_be_resolved_by?
(
current_user
)
end
def
module_enabled
return
render_404
unless
@project
.
merge_requests_enabled
end
...
...
app/models/merge_request.rb
View file @
f96bf657
...
...
@@ -720,6 +720,11 @@ def conflicts
@conflicts
||=
Gitlab
::
Conflict
::
FileCollection
.
new
(
self
)
end
def
conflicts_can_be_resolved_by?
(
user
)
access
=
::
Gitlab
::
UserAccess
.
new
(
user
,
project:
source_project
)
access
.
can_push_to_branch?
(
source_branch
)
end
def
conflicts_can_be_resolved_in_ui?
return
@conflicts_can_be_resolved_in_ui
if
defined?
(
@conflicts_can_be_resolved_in_ui
)
...
...
app/views/projects/merge_requests/widget/open/_conflicts.html.haml
View file @
f96bf657
...
...
@@ -4,9 +4,11 @@
%p
Please
-
if
@merge_request
.
conflicts_can_be_resolved_in_ui?
=
link_to
"resolve these conflicts"
,
conflicts_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
)
or
-
if
@merge_request
.
conflicts_can_be_resolved_by?
(
current_user
)
-
if
@merge_request
.
conflicts_can_be_resolved_in_ui?
=
link_to
"resolve these conflicts"
,
conflicts_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
)
or
-
if
@merge_request
.
can_be_merged_via_command_line_by?
(
current_user
)
#{
link_to
"merge this request manually"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
"data-toggle"
=>
"modal"
}
.
-
else
...
...
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