diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-02-28 15:40:52 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-02-28 15:40:52 +0000 |
| commit | b5b8dc83cc1bb271877c79532ecfb555540672a7 (patch) | |
| tree | 190f6cd6991cbfbabbd670a7aac5ff36eb1a64bb /app/models/note.rb | |
| parent | deef09cd1f0dbe5cab5095ff02f19a5c3588cb91 (diff) | |
| parent | ff2f57da791890957fe97efd46f5c34f270a0c46 (diff) | |
| download | gitlab-ce-dispatcher-cycle-analytics.tar.gz | |
Merge branch 'master' into 'dispatcher-cycle-analytics'dispatcher-cycle-analytics
# Conflicts:
# config/webpack.config.js
Diffstat (limited to 'app/models/note.rb')
| -rw-r--r-- | app/models/note.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index cac60845a49..d7a67ec277c 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -133,6 +133,7 @@ class Note < ActiveRecord::Base def find_discussion(discussion_id) notes = where(discussion_id: discussion_id).fresh.to_a + return if notes.empty? Discussion.build(notes) |