kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Verify user is signed in and can actually resolve conflicts

Browse source
This commit is contained in:
Douwe Maan 2016-08-10 22:36:58 -05:00 committed by Fatih Acet
parent cf4cbb018e
commit 9eca67c950
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/projects/merge_requests_controller.rb
View file

@ -28,6 +28,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
# Allow modify merge_request # Allow modify merge_request
before_action :authorize_update_merge_request!, only: [:close, :edit, :update, :remove_wip, :sort] 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 def index
terms = params['issue_search'] terms = params['issue_search']
@merge_requests = merge_requests_collection @merge_requests = merge_requests_collection
@ -368,6 +370,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController
return render_404 unless can?(current_user, :admin_merge_request, @merge_request) return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
end end
def authorize_can_resolve_conflicts!
return render_404 unless @merge_request.conflicts_can_be_resolved_by?(current_user)
end
def module_enabled def module_enabled
return render_404 unless @project.merge_requests_enabled return render_404 unless @project.merge_requests_enabled
end end

5
app/models/merge_request.rb
View file

@ -720,6 +720,11 @@ class MergeRequest < ActiveRecord::Base
@conflicts ||= Gitlab::Conflict::FileCollection.new(self) @conflicts ||= Gitlab::Conflict::FileCollection.new(self)
end 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? def conflicts_can_be_resolved_in_ui?
return @conflicts_can_be_resolved_in_ui if defined?(@conflicts_can_be_resolved_in_ui) return @conflicts_can_be_resolved_in_ui if defined?(@conflicts_can_be_resolved_in_ui)

8
app/views/projects/merge_requests/widget/open/_conflicts.html.haml
View file

@ -4,9 +4,11 @@
%p %p
Please Please
- if @merge_request.conflicts_can_be_resolved_in_ui? - if @merge_request.conflicts_can_be_resolved_by?(current_user)
= link_to "resolve these conflicts", conflicts_namespace_project_merge_request_path(@project.namespace, @project, @merge_request) - if @merge_request.conflicts_can_be_resolved_in_ui?
or = 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) - 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"}. #{link_to "merge this request manually", "#modal_merge_info", class: "how_to_merge_link vlink", "data-toggle" => "modal"}.
- else - else