diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-06-08 10:15:27 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-06-08 10:15:27 -0500 |
| commit | b55bd9ef95734a6805b11a8a8322149e885425a6 (patch) | |
| tree | 769f52169d7ad85d68aea3218c7e9116f9269b25 /app/models/note.rb | |
| parent | c24b70682448f23d7eb01853026cfe6abdf86190 (diff) | |
| parent | b4972c4b237ad270ad1a4054c2fe2439d60ee06d (diff) | |
| download | gitlab-ce-25426-group-dashboard-ui.tar.gz | |
Merge branch 'master' into 25426-group-dashboard-ui25426-group-dashboard-ui
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' |