summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Engelen <michel.engelen@diva-e.com>2019-06-12 14:24:39 +0200
committerMichel Engelen <michel.engelen@diva-e.com>2019-06-12 14:24:39 +0200
commitfd9029d68582c334037c573dc32ac6c4e1538937 (patch)
treed61da660692e5d7500120f1b5181dfb49346b99b
parent490ab8c3cead59d801e57bb29ff2cfb74e4597f4 (diff)
downloadgitlab-ce-fd9029d68582c334037c573dc32ac6c4e1538937.tar.gz
changed string `discussion` to `thread` in timeline update ("[user] resolved all threads")
-rw-r--r--app/services/system_note_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index 1390f7cdf46..27d59279d75 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -249,7 +249,7 @@ module SystemNoteService
end
def resolve_all_discussions(merge_request, project, author)
- body = "resolved all discussions"
+ body = "resolved all threads"
create_note(NoteSummary.new(merge_request, project, author, body, action: 'discussion'))
end