diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-07-26 12:19:02 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-07-26 12:19:02 +0100 |
| commit | 3abffb2be25844920d6e0b2ac9735ebb38b78ef5 (patch) | |
| tree | ae7a316f7827859bc19ffbc556fe2418649f8d3f | |
| parent | e9946f19a5af84b13fc8f21bdffa0689fd93f6c3 (diff) | |
| download | gitlab-ce-3abffb2be25844920d6e0b2ac9735ebb38b78ef5.tar.gz | |
Fix expand all diffs button in compare view20241-expand-all-button-breaks-diff-comparison-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.
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/projects/diffs/_diffs.html.haml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 181829a86a5..f3abe9f9a59 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -22,6 +22,7 @@ v 8.10.2 (unreleased) - Use project ID in repository cache to prevent stale data from persisting across projects. !5460 - Ensure relative paths for video are rewritten as we do for images. !5474 - Ensure current user can retry a build before showing the 'Retry' button. !5476 + - Fix expand all diffs button in compare view v 8.10.1 - Refactor repository storages documentation. !5428 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') |