diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-27 15:08:31 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-27 15:08:31 +0000 |
| commit | e77cb2465fa34b8883987206a42648603d5bf073 (patch) | |
| tree | f2bbff57b35c6a0c97309056a795e446a3e5b139 /app/views/projects/diffs | |
| parent | e9de373448d0ae4dd330c131db2366a30e0c025d (diff) | |
| download | gitlab-ce-e77cb2465fa34b8883987206a42648603d5bf073.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/diffs')
| -rw-r--r-- | app/views/projects/diffs/_content.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/diffs/_diffs.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/diffs/_content.html.haml b/app/views/projects/diffs/_content.html.haml index 780bb3404cc..0a87ae145ac 100644 --- a/app/views/projects/diffs/_content.html.haml +++ b/app/views/projects/diffs/_content.html.haml @@ -1,7 +1,7 @@ - diff_file = local_assigns.fetch(:diff_file, nil) - file_hash = hexdigest(diff_file.file_path) -.diff-content +.diff-content.gl-rounded-bottom-base - if diff_file.has_renderable? .hidden{ id: "#raw-diff-#{file_hash}", data: { file_hash: file_hash, diff_toggle_entity: 'rawViewer' } } = render 'projects/diffs/viewer', viewer: diff_file.viewer diff --git a/app/views/projects/diffs/_diffs.html.haml b/app/views/projects/diffs/_diffs.html.haml index 03e26fd4456..2cbca618520 100644 --- a/app/views/projects/diffs/_diffs.html.haml +++ b/app/views/projects/diffs/_diffs.html.haml @@ -8,7 +8,7 @@ - page = local_assigns.fetch(:page, nil) - diff_files = conditionally_paginate_diff_files(diffs, paginate: paginate_diffs, page: page, per: paginate_diffs_per_page) -.content-block.oneline-block.files-changed.diff-files-changed.js-diff-files-changed +.files-changed.diff-files-changed.js-diff-files-changed.gl-py-3 .files-changed-inner .inline-parallel-buttons.gl-display-none.gl-md-display-flex - if !diffs_expanded? && diff_files.any?(&:collapsed?) |