Verified Commit 1a17289b authored by Dmytro Zaporozhets's avatar Dmytro Zaporozhets

Merge branch 'remove_source_branch_button' of...

Merge branch 'remove_source_branch_button' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-remove_source_branch_button
Signed-off-by: Dmytro Zaporozhets's avatarDmitriy Zaporozhets <[email protected]>

Conflicts:
	app/assets/javascripts/merge_requests.js.coffee
	app/assets/stylesheets/sections/merge_requests.scss
	app/controllers/projects/merge_requests_controller.rb
parents 2ceef769 f8114954
......@@ -58,6 +58,18 @@ class MergeRequest
$('.automerge_widget.can_be_merged').hide()
$('.merge-in-progress').show()
this.$('.remove_source_branch').on 'click', ->
$('.remove_source_branch_widget').hide()
$('.remove_source_branch_in_progress').show()
this.$(".remove_source_branch").on "ajax:success", (e, data, status, xhr) ->
location.reload()
this.$(".remove_source_branch").on "ajax:error", (e, data, status, xhr) =>
this.$('.remove_source_branch_widget').hide()
this.$('.remove_source_branch_in_progress').hide()
this.$('.remove_source_branch_widget.failed').show()
activateTab: (action) ->
this.$('.nav-tabs li').removeClass 'active'
this.$('.tab-content').hide()
......
......@@ -211,9 +211,25 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@merge_request_diff = @merge_request.merge_request_diff
@allowed_to_merge = allowed_to_merge?
@show_merge_controls = @merge_request.open? && @commits.any? && @allowed_to_merge
@allowed_to_remove_source_branch = allowed_to_remove_source_branch?
@source_branch = @merge_request.source_project.repository.find_branch(@merge_request.source_branch).try(:name)
end
def allowed_to_merge?
allowed_to_push_code?(project)
end
def invalid_mr
# Render special view for MR with removed source or target branch
render 'invalid'
end
def allowed_to_remove_source_branch?
allowed_to_push_code?(@merge_request.source_project) &&
!@merge_request.disallow_source_branch_removal?
end
def allowed_to_push_code?(project)
action = if project.protected_branch?(@merge_request.target_branch)
:push_code_to_protected_branches
else
......@@ -222,9 +238,4 @@ class Projects::MergeRequestsController < Projects::ApplicationController
can?(current_user, action, @project)
end
def invalid_mr
# Render special view for MR with removed source or target branch
render 'invalid'
end
end
......@@ -7,6 +7,7 @@
= render "projects/merge_requests/show/mr_accept"
- else
= render "projects/merge_requests/show/no_accept"
= render "projects/merge_requests/show/remove_source_branch"
- if @merge_request.source_project.gitlab_ci?
= render "projects/merge_requests/show/mr_ci"
= render "projects/merge_requests/show/commits"
......
- if @source_branch.blank?
.bs-callout.bs-callout-info
Source branch has been removed
- elsif @allowed_to_remove_source_branch && @merge_request.merged?
.remove_source_branch_widget
.alert.alert-info
= link_to project_branch_path(@merge_request.source_project, @source_branch), remote: true, method: :delete, class: "btn btn-primary remove_source_branch" do
%i.icon-remove
Remove Source Branch
.remove_source_branch_widget.failed.hide
.alert.alert-error Failed to remove source branch '#{@merge_request.source_branch}'
.remove_source_branch_in_progress.hide
.bs-callout.bs-callout-info
%i.icon-refresh.icon-spin
&nbsp;
Removing source branch '#{@merge_request.source_branch}'. Please wait. Page will be automatically reloaded. &nbsp;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment