diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2016-06-09 20:26:14 +0300 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2016-06-10 19:31:28 +0300 |
| commit | a9d14ddcedb7c126b8ee4942b0ca6e794ff996f8 (patch) | |
| tree | d1f1871cc72f84bc0a5fc35b694278860ff0b5f1 /app/views/projects/diffs/_diffs.html.haml | |
| parent | bedb711453d618e16bccc1e150d7a6437d8342d0 (diff) | |
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
Diffstat (limited to 'app/views/projects/diffs/_diffs.html.haml')
| -rw-r--r-- | app/views/projects/diffs/_diffs.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
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 |