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)}
|
2016-06-16 23:09:34 +05:30
|
|
|
- if !@merge_request.source_branch_exists? || (params[:delete_source] == 'true')
|
|
|
|
|
%p
|
|
|
|
|
The changes were merged into
|
|
|
|
|
#{link_to @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch"}.
|
|
|
|
|
The source branch has been removed.
|
|
|
|
|
= render 'projects/merge_requests/widget/merged_buttons'
|
|
|
|
|
- elsif @merge_request.can_remove_source_branch?(current_user)
|
|
|
|
|
.remove_source_branch_widget
|
2016-04-02 18:10:28 +05:30
|
|
|
%p
|
|
|
|
|
The changes were merged into
|
|
|
|
|
#{link_to @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch"}.
|
2016-06-16 23:09:34 +05:30
|
|
|
You can remove the source branch now.
|
|
|
|
|
= render 'projects/merge_requests/widget/merged_buttons', source_branch_exists: true
|
|
|
|
|
.remove_source_branch_widget.failed.hide
|
|
|
|
|
%p
|
|
|
|
|
Failed to remove source branch '#{@merge_request.source_branch}'.
|
2015-11-26 14:37:03 +05:30
|
|
|
|
2016-06-16 23:09:34 +05:30
|
|
|
.remove_source_branch_in_progress.hide
|
2016-06-02 11:05:42 +05:30
|
|
|
%p
|
2016-06-16 23:09:34 +05:30
|
|
|
= icon('spinner spin')
|
|
|
|
|
Removing source branch '#{@merge_request.source_branch}'. Please wait, this page will be automatically reloaded.
|
|
|
|
|
- else
|
|
|
|
|
%p
|
|
|
|
|
The changes were merged into
|
|
|
|
|
#{link_to @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch"}.
|
|
|
|
|
= render 'projects/merge_requests/widget/merged_buttons'
|
