diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-07-25 22:49:37 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-07-25 22:49:37 -0600 |
| commit | a31e9e1e8f04b8201bda622c7505efcccb373a18 (patch) | |
| tree | 7cf01eba22c21ced9ec4a559dd9f86498e6c3297 | |
| parent | b3180d34861085ce901730af62baa247f77ab5fa (diff) | |
| download | gitlab-ce-a31e9e1e8f04b8201bda622c7505efcccb373a18.tar.gz | |
Tweak wording
3 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/line_comments/components/resolve_all.js.coffee b/app/assets/javascripts/line_comments/components/resolve_all.js.coffee index bcc12fc34fc..86608eb5914 100644 --- a/app/assets/javascripts/line_comments/components/resolve_all.js.coffee +++ b/app/assets/javascripts/line_comments/components/resolve_all.js.coffee @@ -12,7 +12,7 @@ isResolved = false unless resolved isResolved buttonText: -> - if this.allResolved then "Un-resolve all" else "Resolve all" + if this.allResolved then "Unresolve discussion" else "Resolve discussion" loading: -> this.loadingObject[this.discussionId] methods: diff --git a/app/assets/javascripts/line_comments/components/resolve_btn.js.coffee b/app/assets/javascripts/line_comments/components/resolve_btn.js.coffee index acf08942f1d..365df8c1988 100644 --- a/app/assets/javascripts/line_comments/components/resolve_btn.js.coffee +++ b/app/assets/javascripts/line_comments/components/resolve_btn.js.coffee @@ -9,7 +9,7 @@ loading: false computed: buttonText: -> - if this.isResolved then "Mark as un-resolved" else "Mark as resolved" + if this.isResolved then "Mark as unresolved" else "Mark as resolved" isResolved: -> CommentsStore.get(this.discussionId, this.noteId) methods: updateTooltip: -> diff --git a/app/views/projects/merge_requests/_discussion.html.haml b/app/views/projects/merge_requests/_discussion.html.haml index d9da553159d..768d4673680 100644 --- a/app/views/projects/merge_requests/_discussion.html.haml +++ b/app/views/projects/merge_requests/_discussion.html.haml @@ -4,6 +4,6 @@ = link_to 'Close merge request', merge_request_path(@merge_request, merge_request: {state_event: :close }), method: :put, class: "btn btn-nr btn-comment btn-close close-mr-link js-note-target-close", title: "Close merge request", data: {original_text: "Close merge request", alternative_text: "Comment & close merge request"} - if @merge_request.closed? = link_to 'Reopen merge request', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-nr btn-comment btn-reopen reopen-mr-link js-note-target-reopen", title: "Reopen merge request", data: {original_text: "Reopen merge request", alternative_text: "Comment & reopen merge request"} - = submit_tag 'Comment & resolve all', class: "btn btn-nr btn-create append-right-10 comment-btn js-comment-resolve-button", data: { namespace: "#{@merge_request.project.namespace.path}/#{@merge_request.project.path}" } + = submit_tag 'Comment & resolve discussion', class: "btn btn-nr btn-create append-right-10 comment-btn js-comment-resolve-button", data: { namespace: "#{@merge_request.project.namespace.path}/#{@merge_request.project.path}" } #notes= render "projects/notes/notes_with_form" |