diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-28 09:08:05 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-28 09:08:05 +0000 |
| commit | 4c788f43cbcd70bcceb4e40891d329952aa016d0 (patch) | |
| tree | 9cd741579d79355a207ab74d37f26af768281fa0 /app/views/projects/diffs | |
| parent | 616129d41caac06a1ea0b0a36d1b3018eabac833 (diff) | |
| download | gitlab-ce-4c788f43cbcd70bcceb4e40891d329952aa016d0.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/diffs')
| -rw-r--r-- | app/views/projects/diffs/_file.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml index 855b719dc45..7395c16c38b 100644 --- a/app/views/projects/diffs/_file.html.haml +++ b/app/views/projects/diffs/_file.html.haml @@ -14,7 +14,7 @@ .file-actions.d-none.d-sm-block - if blob&.readable_text? = link_to '#', class: 'js-toggle-diff-comments btn active has-tooltip', title: _("Toggle comments for this file"), disabled: @diff_notes_disabled do - = icon('comment') + = sprite_icon('comment', size: 16) \ - if editable_diff?(diff_file) - link_opts = @merge_request.persisted? ? { from_merge_request_iid: @merge_request.iid } : {} |