diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-01-11 17:01:21 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2017-01-11 17:01:21 +0000 |
| commit | 1ff2dfa1cc6ba125ed53d42443713dcbda3f57f6 (patch) | |
| tree | dfa24396b37234cd51268504253bddda8e255f3d /app/views | |
| parent | a9cf230d96f024f18ab720178bb7f63bdadd6649 (diff) | |
| parent | 0ff564347c00b277f494947c8cd6803aa547c68a (diff) | |
| download | gitlab-ce-1ff2dfa1cc6ba125ed53d42443713dcbda3f57f6.tar.gz | |
Merge branch 'side-by-side-fixed-width' into 'master'
Keep max width on MR content on side by side view
Closes #25907
See merge request !8467
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 981bf640a6b..43141971231 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -1,4 +1,4 @@ -- @content_class = "limit-container-width" +- @content_class = "limit-container-width" unless fluid_layout - page_title "#{@issue.title} (#{@issue.to_reference})", "Issues" - page_description @issue.description - page_card_attributes @issue.card_attributes diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index 1f63803c24e..110dd11d1ce 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -1,4 +1,4 @@ -- @content_class = "limit-container-width" +- @content_class = "limit-container-width" unless fluid_layout - page_title "#{@merge_request.title} (#{@merge_request.to_reference})", "Merge Requests" - page_description @merge_request.description - page_card_attributes @merge_request.card_attributes @@ -47,7 +47,7 @@ = succeed '.' do = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal" - .content-block.content-block-small + .content-block.content-block-small.emoji-list-container = render 'award_emoji/awards_block', awardable: @merge_request, inline: true .merge-request-tabs-holder{ class: ("js-tabs-affix" unless ENV['RAILS_ENV'] == 'test') } |