diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-07-03 15:20:09 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-07-03 15:20:09 +0300 |
| commit | fa4c409d78f296a8ef560e1c80a998e7d9c4bf57 (patch) | |
| tree | 00e7defa15f82130ead40a9b102e34615244a9a5 /app/views/shared | |
| parent | 459e419e313cbc6f7c5b5f0555d734ab68d7bc88 (diff) | |
| parent | c587c1b8d9d632f29c0f35758c63f40c5e8b4f8f (diff) | |
Merge branch 'issue/55953' into 'master'
rename `discussion` to `thread`
Closes #55953
See merge request gitlab-org/gitlab-ce!29553
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/issuable/_form.html.haml | 6 | ||||
| -rw-r--r-- | app/views/shared/notes/_comment_button.html.haml | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml index c6a391ae563..1bd56e064d5 100644 --- a/app/views/shared/issuable/_form.html.haml +++ b/app/views/shared/issuable/_form.html.haml @@ -48,13 +48,13 @@ = hidden_field_tag 'merge_request_to_resolve_discussions_of', @merge_request_to_resolve_discussions_of.iid - if @discussion_to_resolve = hidden_field_tag 'discussion_to_resolve', @discussion_to_resolve.id - Creating this issue will resolve the discussion in + Creating this issue will resolve the thread in - else - Creating this issue will resolve all discussions in + Creating this issue will resolve all threads in = link_to_discussions_to_resolve(@merge_request_to_resolve_discussions_of, @discussion_to_resolve) - else The - = @discussion_to_resolve ? 'discussion' : 'discussions' + = @discussion_to_resolve ? 'thread' : 'threads' at = link_to_discussions_to_resolve(@merge_request_to_resolve_discussions_of, @discussion_to_resolve) will stay unresolved. Ask someone with permission to resolve diff --git a/app/views/shared/notes/_comment_button.html.haml b/app/views/shared/notes/_comment_button.html.haml index c3f5eeb0da6..8d74eacc7dc 100644 --- a/app/views/shared/notes/_comment_button.html.haml +++ b/app/views/shared/notes/_comment_button.html.haml @@ -18,11 +18,11 @@ %li.divider.droplab-item-ignore - %li#discussion{ data: { value: 'DiscussionNote', 'submit-text' => _('Start discussion'), 'close-text' => _("Start discussion & close %{noteable_name}") % { noteable_name: noteable_name }, 'reopen-text' => _("Start discussion & reopen %{noteable_name}") % { noteable_name: noteable_name } } } + %li#discussion{ data: { value: 'DiscussionNote', 'submit-text' => _('Start thread'), 'close-text' => _("Start thread & close %{noteable_name}") % { noteable_name: noteable_name }, 'reopen-text' => _("Start thread & reopen %{noteable_name}") % { noteable_name: noteable_name } } } %button.btn.btn-transparent = icon('check', class: 'icon') .description - %strong= _("Start discussion") + %strong= _("Start thread") %p = succeed '.' do - if @note.noteable.supports_resolvable_notes? |