diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2016-06-09 18:26:14 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2016-06-10 17:31:28 +0100 |
| commit | a9d14ddcedb7c126b8ee4942b0ca6e794ff996f8 (patch) | |
| tree | d1f1871cc72f84bc0a5fc35b694278860ff0b5f1 | |
| parent | bedb711453d618e16bccc1e150d7a6437d8342d0 (diff) | |
| download | gitlab-ce-a9d14ddcedb7c126b8ee4942b0ca6e794ff996f8.tar.gz | |
added whitespace toggle to diffs page and set it to return the project compare path with the selected whitespace params
Updated CHANGELOG
Moved CHANGELOG entry
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/helpers/diff_helper.rb | 5 | ||||
| -rw-r--r-- | app/views/projects/diffs/_diffs.html.haml | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 0c712b445a4..58bd01741db 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -38,6 +38,7 @@ v 8.9.0 (unreleased) - Add support for using Yubikeys (U2F) for two-factor authentication - Link to blank group icon doesn't throw a 404 anymore - Remove 'main language' feature + - Toggle whitespace button now available for compare branches diffs #17881 - Pipelines can be canceled only when there are running builds - Use downcased path to container repository as this is expected path by Docker - Projects pending deletion will render a 404 page diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index cbe47176831..e22dce59d0f 100644 --- a/app/helpers/diff_helper.rb +++ b/app/helpers/diff_helper.rb @@ -135,6 +135,11 @@ module DiffHelper toggle_whitespace_link(url, options) end + def diff_compare_whitespace_link(project, from, to, options) + url = namespace_project_compare_path(project.namespace, project, from, to, params_with_whitespace) + toggle_whitespace_link(url, options) + end + private def hide_whitespace? diff --git a/app/views/projects/diffs/_diffs.html.haml b/app/views/projects/diffs/_diffs.html.haml index d9c4b410d32..1e8d99f06eb 100644 --- a/app/views/projects/diffs/_diffs.html.haml +++ b/app/views/projects/diffs/_diffs.html.haml @@ -11,6 +11,8 @@ = commit_diff_whitespace_link(@project, @commit, class: 'hidden-xs') - elsif current_controller?(:merge_requests) = diff_merge_request_whitespace_link(@project, @merge_request, class: 'hidden-xs') + - elsif current_controller?(:compare) + = diff_compare_whitespace_link(@project, params[:from], params[:to], class: 'hidden-xs') .btn-group = inline_diff_btn = parallel_diff_btn |