diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2017-03-08 16:39:20 +0100 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2017-03-13 08:27:51 +0100 |
| commit | f82115885d07e4eefec3594bdfc4bcd0210a1277 (patch) | |
| tree | ec0b1614d78e9234597d57fff55e42e69b61d023 /app/views | |
| parent | 9709309e738aa1703afd78d2c5482b367a662d4a (diff) | |
| download | gitlab-ce-f82115885d07e4eefec3594bdfc4bcd0210a1277.tar.gz | |
Build link to discussions to resolve in a helper
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/shared/issuable/_form.html.haml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml index 907eb399c61..50b4bcff3bd 100644 --- a/app/views/shared/issuable/_form.html.haml +++ b/app/views/shared/issuable/_form.html.haml @@ -54,13 +54,12 @@ - if @discussion_to_resolve = hidden_field_tag 'discussion_to_resolve', @discussion_to_resolve.id Creating this issue will resolve the discussion in - = link_to "#{@merge_request_for_resolving_discussions.to_reference} (discussion #{@discussion_to_resolve.first_note.id})", Gitlab::UrlBuilder.build(@discussion_to_resolve.first_note) - else Creating this issue will resolve all discussions in - = link_to @merge_request_for_resolving_discussions.to_reference, merge_request_path(@merge_request_for_resolving_discussions) + = link_to_discussions_to_resolve(@merge_request_for_resolving_discussions, @discussion_to_resolve) - else The discussion at - = link_to @merge_request_for_resolving_discussions.to_reference, merge_request_path(@merge_request_for_resolving_discussions) + = link_to_discussions_to_resolve(@merge_request_for_resolving_discussions, @discussion_to_resolve) will stay unresolved. Ask someone with permission to resolve it. - is_footer = !(issuable.is_a?(MergeRequest) && issuable.new_record?) |