diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-26 17:53:31 -0700 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-26 17:53:31 -0700 |
| commit | 843694f90270e290f164bed68362500c9e331a46 (patch) | |
| tree | 0e20cc09df536365db817ba8aef4c77d3d0c684e /app/views/projects/diffs | |
| parent | 6afd69f4445cc0688aa1695389eb3f79033e3121 (diff) | |
| parent | de3b7d9c522db8d129a64f2b86297cf90413cb1e (diff) | |
| download | gitlab-ce-843694f90270e290f164bed68362500c9e331a46.tar.gz | |
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
Diffstat (limited to 'app/views/projects/diffs')
| -rw-r--r-- | app/views/projects/diffs/_diffs.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/diffs/_warning.html.haml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/views/projects/diffs/_diffs.html.haml b/app/views/projects/diffs/_diffs.html.haml index 52c1e03040c..30943f49bba 100644 --- a/app/views/projects/diffs/_diffs.html.haml +++ b/app/views/projects/diffs/_diffs.html.haml @@ -1,3 +1,6 @@ +- if params[:view] == 'parallel' + - fluid_layout true + .prepend-top-20.append-bottom-20 .pull-right .btn-group diff --git a/app/views/projects/diffs/_warning.html.haml b/app/views/projects/diffs/_warning.html.haml index caed0e69dc8..f99bc9a85eb 100644 --- a/app/views/projects/diffs/_warning.html.haml +++ b/app/views/projects/diffs/_warning.html.haml @@ -3,7 +3,7 @@ Too many changes to show. .pull-right - unless diff_hard_limit_enabled? - = link_to "Reload with full diff", url_for(params.merge(force_show_diff: true, format: :html)), class: "btn btn-sm btn-warning" + = link_to "Reload with full diff", url_for(params.merge(force_show_diff: true, format: nil)), class: "btn btn-sm btn-warning" - if current_controller?(:commit) or current_controller?(:merge_requests) - if current_controller?(:commit) |