home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity

Link to branches from MR "Request to merge X into Y" sentence

Browse Source
This commit is contained in:
Douwe Maan
2015-12-02 14:23:41 +01:00
parent 7a65cb3abf
commit 1df2908b27
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/projects/merge_requests/_show.html.haml
+3 -2
View File
@@ -26,9 +26,10 @@
%li= link_to "Plain Diff", merge_request_path(@merge_request, format: :diff)
.normal
%span Request to merge
%span.label-branch #{source_branch_with_namespace(@merge_request)}
= link_to source_branch_with_namespace(@merge_request), namespace_project_commits_path(@merge_request.source_project.namespace, @merge_request.source_project, @merge_request.source_branch), class: "label-branch"
%span into
%span.label-branch #{@merge_request.target_branch}
= link_to namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch" do
= @merge_request.target_branch
= render "projects/merge_requests/show/how_to_merge"
= render "projects/merge_requests/widget/show.html.haml"
app/views/projects/merge_requests/widget/_merged.html.haml
+4 -2
View File
@@ -10,7 +10,8 @@
- if !@merge_request.source_branch_exists?
= succeed '.' do
The changes were merged into
%span.label-branch= @merge_request.target_branch
= link_to namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch" do
= @merge_request.target_branch
The source branch has been removed.
- elsif can_remove_branch?(@merge_request.source_project, @merge_request.source_branch)
@@ -18,7 +19,8 @@
%p
= succeed '.' do
The changes were merged into
%span.label-branch= @merge_request.target_branch
= link_to namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch" do
= @merge_request.target_branch
You can remove the source branch now.
= 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
%i.fa.fa-times