diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-10 16:42:34 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-10 16:42:34 +0000 |
| commit | 46785604db0409f261cd07d27494f5abe4ae9ae8 (patch) | |
| tree | e3e5dc4e8a9bf1a4686e8181cd7d1920527e44e5 | |
| parent | d81794ad4992aa234a8916088616c0faac731e49 (diff) | |
| parent | cc37d1dfa11691f2d8357151d4b722b3d114881e (diff) | |
| download | gitlab-ce-46785604db0409f261cd07d27494f5abe4ae9ae8.tar.gz | |
Merge branch 'dm-discussion-diff-header-toggle' into 'master'
Remove unused toggle from diff discussion diff headers
See merge request !11192
| -rw-r--r-- | app/views/discussions/_diff_with_notes.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/diffs/_file_header.html.haml | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/views/discussions/_diff_with_notes.html.haml b/app/views/discussions/_diff_with_notes.html.haml index 78c5b0c1dda..c3f55ff821f 100644 --- a/app/views/discussions/_diff_with_notes.html.haml +++ b/app/views/discussions/_diff_with_notes.html.haml @@ -3,7 +3,7 @@ .diff-file.file-holder .js-file-title.file-title - = render "projects/diffs/file_header", diff_file: diff_file, blob: blob, diff_commit: diff_file.content_commit, project: discussion.project, url: discussion_path(discussion) + = render "projects/diffs/file_header", diff_file: diff_file, blob: blob, diff_commit: diff_file.content_commit, project: discussion.project, url: discussion_path(discussion), show_toggle: false .diff-content.code.js-syntax-highlight %table diff --git a/app/views/projects/diffs/_file_header.html.haml b/app/views/projects/diffs/_file_header.html.haml index 7d6b3701f95..4e4fdb73ae3 100644 --- a/app/views/projects/diffs/_file_header.html.haml +++ b/app/views/projects/diffs/_file_header.html.haml @@ -1,4 +1,8 @@ -%i.fa.diff-toggle-caret.fa-fw +- show_toggle = local_assigns.fetch(:show_toggle, true) + +- if show_toggle + %i.fa.diff-toggle-caret.fa-fw + - if defined?(blob) && blob && diff_file.submodule? %span = icon('archive fw') |