diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-16 18:19:41 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-16 18:19:41 +0200 |
| commit | 9f2c992ff1520e35d9b7bc26d603d597bc189618 (patch) | |
| tree | 17af71363c63d99a15c76b1edcbceddc87bfc12d /app/models/note.rb | |
| parent | 64bb0d37d4ef1f8574355019f198e40bc9b70224 (diff) | |
| parent | 5f42009f8dcc29d559ee415e92c88858e361f063 (diff) | |
| download | gitlab-ce-9f2c992ff1520e35d9b7bc26d603d597bc189618.tar.gz | |
Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-review-branch
Diffstat (limited to 'app/models/note.rb')
| -rw-r--r-- | app/models/note.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index 563af47f314..244bf169c29 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -41,7 +41,7 @@ class Note < ActiveRecord::Base participant :author belongs_to :project - belongs_to :noteable, polymorphic: true, touch: true + belongs_to :noteable, polymorphic: true, touch: true # rubocop:disable Cop/PolymorphicAssociations belongs_to :author, class_name: "User" belongs_to :updated_by, class_name: "User" belongs_to :last_edited_by, class_name: 'User' |