diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-03-30 19:33:45 -0600 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-05 17:44:14 +0100 |
| commit | bb8cc946689bfafb1e3a65aa00b8e75fb8a5006b (patch) | |
| tree | c63719f281b3e38c149ce8a7425d826850914f80 /app/models/out_of_context_discussion.rb | |
| parent | 2058e71e63c9ac471137f831b4d04b6626968532 (diff) | |
| download | gitlab-ce-bb8cc946689bfafb1e3a65aa00b8e75fb8a5006b.tar.gz | |
Don't use original_discussion_id
Diffstat (limited to 'app/models/out_of_context_discussion.rb')
| -rw-r--r-- | app/models/out_of_context_discussion.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/out_of_context_discussion.rb b/app/models/out_of_context_discussion.rb index 0019064e25c..ecbfd97699f 100644 --- a/app/models/out_of_context_discussion.rb +++ b/app/models/out_of_context_discussion.rb @@ -2,7 +2,7 @@ class OutOfContextDiscussion < Discussion # To make sure all out-of-context notes are displayed in one discussion, # we override the discussion ID to be a newly generated but consistent ID. def self.override_discussion_id(note) - discussion_id(note) + Digest::SHA1.hexdigest(build_discussion_id_base(note).join("-")) end # Keep this method in sync with the `potentially_resolvable` scope on `ResolvableNote` |