diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-07-03 12:20:09 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-07-03 12:20:09 +0000 |
| commit | fa4c409d78f296a8ef560e1c80a998e7d9c4bf57 (patch) | |
| tree | 00e7defa15f82130ead40a9b102e34615244a9a5 /app/services | |
| parent | 459e419e313cbc6f7c5b5f0555d734ab68d7bc88 (diff) | |
| parent | c587c1b8d9d632f29c0f35758c63f40c5e8b4f8f (diff) | |
| download | gitlab-ce-fa4c409d78f296a8ef560e1c80a998e7d9c4bf57.tar.gz | |
Merge branch 'issue/55953' into 'master'
rename `discussion` to `thread`
Closes #55953
See merge request gitlab-org/gitlab-ce!29553
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/system_note_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb index 8f7cfe582ca..237ddbcf2c2 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 |