diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-15 21:08:48 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-15 21:08:48 +0000 |
| commit | 600ca978129e3ccab758f57d60786cefe66ad775 (patch) | |
| tree | a3675da98c7c245adf7e93f82f9c26a38cc3c29d /app/views/projects | |
| parent | 571d993b49313dd806bd3f6af16d36c26d9d28ca (diff) | |
| download | gitlab-ce-600ca978129e3ccab758f57d60786cefe66ad775.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/diffs/_viewer.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/diffs/viewers/_collapsed.html.haml (renamed from app/views/projects/diffs/_collapsed.html.haml) | 0 |
2 files changed, 0 insertions, 2 deletions
diff --git a/app/views/projects/diffs/_viewer.html.haml b/app/views/projects/diffs/_viewer.html.haml index 5c4d1760871..37ff03b4a59 100644 --- a/app/views/projects/diffs/_viewer.html.haml +++ b/app/views/projects/diffs/_viewer.html.haml @@ -3,8 +3,6 @@ .diff-viewer{ data: { type: viewer.type }, class: ('hidden' if hidden) } - if viewer.render_error = render 'projects/diffs/render_error', viewer: viewer - - elsif viewer.collapsed? - = render 'projects/diffs/collapsed', viewer: viewer - else - viewer.prepare! diff --git a/app/views/projects/diffs/_collapsed.html.haml b/app/views/projects/diffs/viewers/_collapsed.html.haml index 94dcda38bd6..94dcda38bd6 100644 --- a/app/views/projects/diffs/_collapsed.html.haml +++ b/app/views/projects/diffs/viewers/_collapsed.html.haml |