diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-07 14:21:12 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-08-09 16:40:27 +0100 |
| commit | c76091804ff3f81a04b3c0579e4c84f4c2234ed8 (patch) | |
| tree | 00d0cfaad3f9bb7db2afe7f9a7b08a4268c6928f /app/views | |
| parent | 8fbbd3f27a5f69cfc9f4ddd05e46498c9e5ccf60 (diff) | |
| download | gitlab-ce-c76091804ff3f81a04b3c0579e4c84f4c2234ed8.tar.gz | |
Fix the sticky changes bar on commits pagefixed-sticky-stats-box-commit-view
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/diffs/_diffs.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/diffs/_diffs.html.haml | 2 |
2 files changed, 3 insertions, 2 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? } diff --git a/app/views/projects/merge_requests/diffs/_diffs.html.haml b/app/views/projects/merge_requests/diffs/_diffs.html.haml index fb31e2fef00..0d30d6da68f 100644 --- a/app/views/projects/merge_requests/diffs/_diffs.html.haml +++ b/app/views/projects/merge_requests/diffs/_diffs.html.haml @@ -1,5 +1,5 @@ - if @merge_request_diff.collected? || @merge_request_diff.overflow? = render 'projects/merge_requests/diffs/versions' - = render "projects/diffs/diffs", diffs: @diffs, environment: @environment + = render "projects/diffs/diffs", diffs: @diffs, environment: @environment, merge_request: true - elsif @merge_request_diff.empty? .nothing-here-block Nothing to merge from #{@merge_request.source_branch} into #{@merge_request.target_branch} |