diff options
| author | Michel Engelen <michel.engelen@diva-e.com> | 2019-06-14 11:04:01 +0200 |
|---|---|---|
| committer | Michel Engelen <michel@nomorejs.net> | 2019-07-02 14:29:54 +0200 |
| commit | 8f13c3b321fca401cb0261624548f37fe81eb44b (patch) | |
| tree | fac84ba9760a352e4b706ecc66a2484aa6aa84cb | |
| parent | 638542467bfc3d1726312c08a768736f647ba6b5 (diff) | |
| download | gitlab-ce-8f13c3b321fca401cb0261624548f37fe81eb44b.tar.gz | |
replaced string `discussion` with `thread` in issuable-form template
| -rw-r--r-- | app/views/shared/issuable/_form.html.haml | 6 |
1 files changed, 3 insertions, 3 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 |