diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-08-10 08:33:15 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-08-10 08:33:15 +0000 |
| commit | 8790dc0bf8a743c10870946f86f997f219ac3a82 (patch) | |
| tree | 14ecac3a7a4858995082f360af95e930610dc42a /app/views/projects/diffs/_diffs.html.haml | |
| parent | 7e82da8590fbe992b71e240113a28c62a6124bd1 (diff) | |
| parent | c76091804ff3f81a04b3c0579e4c84f4c2234ed8 (diff) | |
| download | gitlab-ce-8790dc0bf8a743c10870946f86f997f219ac3a82.tar.gz | |
Merge branch 'fixed-sticky-stats-box-commit-view' into 'master'
Fix the sticky changes bar on commits page
See merge request !13343
Diffstat (limited to 'app/views/projects/diffs/_diffs.html.haml')
| -rw-r--r-- | app/views/projects/diffs/_diffs.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/diffs/_diffs.html.haml b/app/views/projects/diffs/_diffs.html.haml index 25a5dfc2aaa..178ab3df2e5 100644 --- a/app/views/projects/diffs/_diffs.html.haml +++ b/app/views/projects/diffs/_diffs.html.haml @@ -2,8 +2,9 @@ - show_whitespace_toggle = local_assigns.fetch(:show_whitespace_toggle, true) - can_create_note = !@diff_notes_disabled && can?(current_user, :create_note, diffs.project) - diff_files = diffs.diff_files +- merge_request = local_assigns.fetch(:merge_request, false) -.content-block.oneline-block.files-changed.diff-files-changed.js-diff-files-changed +.content-block.oneline-block.files-changed.diff-files-changed.js-diff-files-changed{ class: ("diff-files-changed-merge-request" if merge_request) } .files-changed-inner .inline-parallel-buttons - if !diffs_expanded? && diff_files.any? { |diff_file| diff_file.collapsed? } |