Commit dab9835a authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Use label-branch css for MR branches info

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent f0c26bcb
...@@ -2,11 +2,9 @@ ...@@ -2,11 +2,9 @@
New merge request New merge request
%p.slead %p.slead
From From
%strong.monospace %strong.label-branch #{@merge_request.source_project_namespace}:#{@merge_request.source_branch}
#{@merge_request.source_project_namespace}:#{@merge_request.source_branch} %span into
into %strong.label-branch #{@merge_request.target_project_namespace}:#{@merge_request.target_branch}
%strong.monospace
#{@merge_request.target_project_namespace}:#{@merge_request.target_branch}
%span.pull-right %span.pull-right
= link_to 'Change branches', new_project_merge_request_path(@project) = link_to 'Change branches', new_project_merge_request_path(@project)
......
...@@ -28,15 +28,11 @@ ...@@ -28,15 +28,11 @@
= link_to project_merge_requests_path(@project) do = link_to project_merge_requests_path(@project) do
&larr; To merge requests &larr; To merge requests
%span.prepend-left-20.monospace %span.prepend-left-20
-if @merge_request.for_fork? %span From
%span - if @merge_request.for_fork?
%strong %strong.label-branch #{@merge_request.source_project_namespace}:#{@merge_request.source_branch}
#{truncate(@merge_request.source_project_path, length: 25)}:
#{@merge_request.source_branch}
&rarr;
%span= @merge_request.target_branch
- else - else
%span= @merge_request.source_branch %strong.label-branch #{@merge_request.source_branch}
&rarr; %span into
%span= @merge_request.target_branch %strong.label-branch #{@merge_request.target_branch}
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