diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-09 15:08:47 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-09 15:08:47 +0000 |
| commit | 825e4190a30a745adb37ab822eb8f9d845b462e7 (patch) | |
| tree | 2588f929e0dc2bd97bf9b57eee596ae65315144c /app/views/shared/issuable/_form.html.haml | |
| parent | d022b7432efd720f0cf5f8d2a2cdaac7619bab57 (diff) | |
| download | gitlab-ce-825e4190a30a745adb37ab822eb8f9d845b462e7.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/shared/issuable/_form.html.haml')
| -rw-r--r-- | app/views/shared/issuable/_form.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml index ac8bed74611..c38fb4efaa0 100644 --- a/app/views/shared/issuable/_form.html.haml +++ b/app/views/shared/issuable/_form.html.haml @@ -46,7 +46,7 @@ - if @merge_request_to_resolve_discussions_of .form-group.row .col-sm-10.offset-sm-2 - = icon('info-circle') + = sprite_icon('information-o') - if @merge_request_to_resolve_discussions_of.discussions_can_be_resolved_by?(current_user) = hidden_field_tag 'merge_request_to_resolve_discussions_of', @merge_request_to_resolve_discussions_of.iid - if @discussion_to_resolve |