diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-05-03 14:57:02 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-05-03 14:57:02 +0000 |
| commit | 552013b47f3a37e4584f11faa82f5afb60fe8edc (patch) | |
| tree | 5b273f2b59063c6b33f742d8da2ad17fdd03e328 /app/views | |
| parent | 57513512b9d0c92f100db7d438f239a256231c33 (diff) | |
| parent | ce5f7008fbd697e1af4a0bcf91b8a0d7c26cb643 (diff) | |
| download | gitlab-ce-552013b47f3a37e4584f11faa82f5afb60fe8edc.tar.gz | |
Merge branch 'commit-limited-container-width' into 'master'
Commit view correctly spans the full width when parallel view
Closes #30881
See merge request !10851
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/commit/show.html.haml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/projects/commit/show.html.haml b/app/views/projects/commit/show.html.haml index 0d11da2451a..16d2646cb4e 100644 --- a/app/views/projects/commit/show.html.haml +++ b/app/views/projects/commit/show.html.haml @@ -1,9 +1,11 @@ - @no_container = true +- container_class = !fluid_layout && diff_view == :inline ? 'container-limited' : '' +- limited_container_width = fluid_layout || diff_view == :inline ? '' : 'limit-container-width' - page_title "#{@commit.title} (#{@commit.short_id})", "Commits" - page_description @commit.description = render "projects/commits/head" -%div{ class: container_class } +.container-fluid{ class: [limited_container_width, container_class] } = render "commit_box" - if @commit.status = render "ci_menu" |