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

Use label-branch css for MR branches info

Browse Source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets
2014-07-30 22:58:20 +03:00
parent f0c26bcb64
commit dab9835ae1
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/projects/merge_requests/_new_submit.html.haml
+3 -5
View File
@@ -2,11 +2,9 @@
New merge request
%p.slead
From
%strong.monospace
#{@merge_request.source_project_namespace}:#{@merge_request.source_branch}
into
%strong.monospace
#{@merge_request.target_project_namespace}:#{@merge_request.target_branch}
%strong.label-branch #{@merge_request.source_project_namespace}:#{@merge_request.source_branch}
%span into
%strong.label-branch #{@merge_request.target_project_namespace}:#{@merge_request.target_branch}
%span.pull-right
= link_to 'Change branches', new_project_merge_request_path(@project)
app/views/projects/merge_requests/show/_mr_title.html.haml
+7 -11
View File
@@ -28,15 +28,11 @@
= link_to project_merge_requests_path(@project) do
&larr; To merge requests
%span.prepend-left-20.monospace
-if @merge_request.for_fork?
%span
%strong
#{truncate(@merge_request.source_project_path, length: 25)}:
#{@merge_request.source_branch}
&rarr;
%span= @merge_request.target_branch
%span.prepend-left-20
%span From
- if @merge_request.for_fork?
%strong.label-branch #{@merge_request.source_project_namespace}:#{@merge_request.source_branch}
- else
%span= @merge_request.source_branch
&rarr;
%span= @merge_request.target_branch
%strong.label-branch #{@merge_request.source_branch}
%span into
%strong.label-branch #{@merge_request.target_branch}