2015-09-11 14:41:01 +05:30
|
|
|
.mr-state-widget
|
|
|
|
|
= render 'projects/merge_requests/widget/heading'
|
|
|
|
|
.mr-widget-body
|
|
|
|
|
%h4
|
|
|
|
|
Merged
|
|
|
|
|
- if @merge_request.merge_event
|
|
|
|
|
by #{link_to_member(@project, @merge_request.merge_event.author, avatar: true)}
|
|
|
|
|
#{time_ago_with_tooltip(@merge_request.merge_event.created_at)}
|
|
|
|
|
%div
|
|
|
|
|
- if !@merge_request.source_branch_exists?
|
|
|
|
|
= succeed '.' do
|
|
|
|
|
The changes were merged into
|
|
|
|
|
%span.label-branch= @merge_request.target_branch
|
|
|
|
|
The source branch has been removed.
|
|
|
|
|
|
|
|
|
|
- elsif can_remove_branch?(@merge_request.source_project, @merge_request.source_branch)
|
|
|
|
|
.remove_source_branch_widget
|
|
|
|
|
%p
|
|
|
|
|
= succeed '.' do
|
|
|
|
|
The changes were merged into
|
|
|
|
|
%span.label-branch= @merge_request.target_branch
|
|
|
|
|
You can remove the source branch now.
|
2015-10-24 18:46:33 +05:30
|
|
|
= link_to namespace_project_branch_path(@merge_request.source_project.namespace, @merge_request.source_project, @merge_request.source_branch), remote: true, method: :delete, class: "btn btn-primary btn-sm remove_source_branch" do
|
2015-09-11 14:41:01 +05:30
|
|
|
%i.fa.fa-times
|
|
|
|
|
Remove Source Branch
|
|
|
|
|
|
|
|
|
|
.remove_source_branch_widget.failed.hide
|
|
|
|
|
%p
|
|
|
|
|
Failed to remove source branch '#{@merge_request.source_branch}'.
|
|
|
|
|
|
|
|
|
|
.remove_source_branch_in_progress.hide
|
|
|
|
|
%p
|
|
|
|
|
= icon('spinner spin')
|
|
|
|
|
Removing source branch '#{@merge_request.source_branch}'. Please wait. This page will be automatically reload.
|
|
|
|
|
|
|
|
|
|
:coffeescript
|
|
|
|
|
$('.remove_source_branch').on 'click', ->
|
|
|
|
|
$('.remove_source_branch_widget').hide()
|
|
|
|
|
$('.remove_source_branch_in_progress').show()
|
|
|
|
|
|
|
|
|
|
$(".remove_source_branch").on "ajax:success", (e, data, status, xhr) ->
|
|
|
|
|
location.reload()
|
|
|
|
|
|
|
|
|
|
$(".remove_source_branch").on "ajax:error", (e, data, status, xhr) ->
|
|
|
|
|
$('.remove_source_branch_widget').hide()
|
|
|
|
|
$('.remove_source_branch_in_progress').hide()
|
|
|
|
|
$('.remove_source_branch_widget.failed').show()
|
|
|
|
|
|
|
|
|
|
|
