diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2017-03-09 12:20:09 +0100 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2017-03-13 08:27:52 +0100 |
| commit | 40dd993774814c484d3161c86287dd56cf06e436 (patch) | |
| tree | e33f4db003113a55801a8485c68c2dbba69e97a9 | |
| parent | 67bd277ae6e7246543b2aeaf83a9c39412e18d05 (diff) | |
| download | gitlab-ce-40dd993774814c484d3161c86287dd56cf06e436.tar.gz | |
Replace the warning with an info icon
| -rw-r--r-- | app/views/shared/issuable/_form.html.haml | 2 | ||||
| -rw-r--r-- | doc/user/project/merge_requests/img/preview_issue_for_discussion.png | bin | 214794 -> 82412 bytes | |||
| -rw-r--r-- | doc/user/project/merge_requests/img/resolve_discussion_issue_notice.png | bin | 11123 -> 10307 bytes |
3 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 50b4bcff3bd..9d0c165450b 100644 --- a/app/views/shared/issuable/_form.html.haml +++ b/app/views/shared/issuable/_form.html.haml @@ -48,7 +48,7 @@ - if @merge_request_for_resolving_discussions .form-group .col-sm-10.col-sm-offset-2 - = icon('exclamation-triangle') + = icon('info-circle') - if @merge_request_for_resolving_discussions.discussions_can_be_resolved_by?(current_user) = hidden_field_tag 'merge_request_for_resolving_discussions', @merge_request_for_resolving_discussions.iid - if @discussion_to_resolve diff --git a/doc/user/project/merge_requests/img/preview_issue_for_discussion.png b/doc/user/project/merge_requests/img/preview_issue_for_discussion.png Binary files differindex b38cf7d5c66..2ee0653b2ba 100644 --- a/doc/user/project/merge_requests/img/preview_issue_for_discussion.png +++ b/doc/user/project/merge_requests/img/preview_issue_for_discussion.png diff --git a/doc/user/project/merge_requests/img/resolve_discussion_issue_notice.png b/doc/user/project/merge_requests/img/resolve_discussion_issue_notice.png Binary files differindex 8c7ce215ae0..e0ee6a39ffd 100644 --- a/doc/user/project/merge_requests/img/resolve_discussion_issue_notice.png +++ b/doc/user/project/merge_requests/img/resolve_discussion_issue_notice.png |
