diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-16 16:34:56 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-16 16:34:56 +0000 |
| commit | ae71032d0af1730c359089f3edc9029a8b5c8acc (patch) | |
| tree | 2cc27e701556a6ff4c5238f6c601aeca0a291292 /app/views/projects/merge_requests/_show.html.haml | |
| parent | fdc944e0b47c67c76cd38b95e1c10c862c77acc6 (diff) | |
| parent | 24d2e662d4251ed8c73a57319576af6de3d488a1 (diff) | |
| download | gitlab-ce-ae71032d0af1730c359089f3edc9029a8b5c8acc.tar.gz | |
Merge branch '20916-issues-mrs-linelength' into 'master'
Shorten line length of issues and mrs
Limits container width on issue and mr pages. Shortens line length to human readable length.
Closes #20916
Closes #24408
See merge request !7858
Diffstat (limited to 'app/views/projects/merge_requests/_show.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index 5febe806bdd..7725558518f 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -1,3 +1,4 @@ +- @content_class = "limit-container-width" - page_title "#{@merge_request.title} (#{@merge_request.to_reference})", "Merge Requests" - page_description @merge_request.description - page_card_attributes @merge_request.card_attributes @@ -41,7 +42,7 @@ = render "projects/merge_requests/widget/show.html.haml" - if @merge_request.source_branch_exists? && @merge_request.mergeable? && @merge_request.can_be_merged_by?(current_user) - .light.prepend-top-default.append-bottom-default + .merge-manually.light.prepend-top-default.append-bottom-default You can also accept this merge request manually using the = succeed '.' do = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal" |