Skip to content
Snippets Groups Projects
Verified Commit 38bac5d7 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Show avatars in merge widget and fix mr download button overflow

parent 9c6f6a19
No related branches found
No related tags found
No related merge requests found
Loading
@@ -22,15 +22,14 @@
Loading
@@ -22,15 +22,14 @@
%span into %span into
%strong.label-branch #{@merge_request.target_branch} %strong.label-branch #{@merge_request.target_branch}
- if @merge_request.open? - if @merge_request.open?
%span.pull-right .btn-group.btn-group-sm.pull-right
.btn-group %a.btn.btn-sm.dropdown-toggle{ data: {toggle: :dropdown} }
%a.btn.dropdown-toggle{ data: {toggle: :dropdown} } = icon('download')
= icon('download') Download as
Download as %span.caret
%span.caret %ul.dropdown-menu
%ul.dropdown-menu %li= link_to "Email Patches", merge_request_path(@merge_request, format: :patch)
%li= link_to "Email Patches", merge_request_path(@merge_request, format: :patch) %li= link_to "Plain Diff", merge_request_path(@merge_request, format: :diff)
%li= link_to "Plain Diff", merge_request_path(@merge_request, format: :diff)
   
= render "projects/merge_requests/show/how_to_merge" = render "projects/merge_requests/show/how_to_merge"
= render "projects/merge_requests/show/state_widget" = render "projects/merge_requests/show/state_widget"
Loading
Loading
Loading
@@ -13,7 +13,7 @@
Loading
@@ -13,7 +13,7 @@
%h4 %h4
Rejected Rejected
- if @merge_request.closed_event - if @merge_request.closed_event
by #{link_to_member(@project, @merge_request.closed_event.author, avatar: false)} by #{link_to_member(@project, @merge_request.closed_event.author, avatar: true)}
#{time_ago_with_tooltip(@merge_request.closed_event.created_at)} #{time_ago_with_tooltip(@merge_request.closed_event.created_at)}
%p Changes were not merged into target branch %p Changes were not merged into target branch
   
Loading
@@ -21,7 +21,7 @@
Loading
@@ -21,7 +21,7 @@
%h4 %h4
Accepted Accepted
- if @merge_request.merge_event - if @merge_request.merge_event
by #{link_to_member(@project, @merge_request.merge_event.author, avatar: false)} by #{link_to_member(@project, @merge_request.merge_event.author, avatar: true)}
#{time_ago_with_tooltip(@merge_request.merge_event.created_at)} #{time_ago_with_tooltip(@merge_request.merge_event.created_at)}
= render "projects/merge_requests/show/remove_source_branch" = render "projects/merge_requests/show/remove_source_branch"
   
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment