diff options
author | Sean McGivern <sean@gitlab.com> | 2016-07-26 14:19:02 +0300 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2016-07-26 14:19:02 +0300 |
commit | 3abffb2be25844920d6e0b2ac9735ebb38b78ef5 (patch) | |
tree | ae7a316f7827859bc19ffbc556fe2418649f8d3f /app/views/projects/diffs/_diffs.html.haml | |
parent | e9946f19a5af84b13fc8f21bdffa0689fd93f6c3 (diff) |
Fix expand all diffs button in compare view
We can't reuse the existing value of the format parameter, because on
the merge request page that's 'json', so the link would go to a JSON
file. We can't set it to HTML, because that adds '.html' the URL, which
breaks the compare view (and looks bad). Setting it to nil uses the
default format, which in all of these cases is HTML anyway.
Diffstat (limited to 'app/views/projects/diffs/_diffs.html.haml')
-rw-r--r-- | app/views/projects/diffs/_diffs.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/diffs/_diffs.html.haml b/app/views/projects/diffs/_diffs.html.haml index 8ae433b4823..4bf3ccace20 100644 --- a/app/views/projects/diffs/_diffs.html.haml +++ b/app/views/projects/diffs/_diffs.html.haml @@ -7,7 +7,7 @@ .content-block.oneline-block.files-changed .inline-parallel-buttons - if !expand_all_diffs? && diff_files.any? { |diff_file| diff_file.collapsed? } - = link_to 'Expand all', url_for(params.merge(expand_all_diffs: 1, format: 'html')), class: 'btn btn-default' + = link_to 'Expand all', url_for(params.merge(expand_all_diffs: 1, format: nil)), class: 'btn btn-default' - if show_whitespace_toggle - if current_controller?(:commit) = commit_diff_whitespace_link(@project, @commit, class: 'hidden-xs') |