diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-06-08 09:29:57 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-06-08 09:29:57 +0100 |
| commit | 3004a05c884279fd0cd4982282947d55bfbb2ce0 (patch) | |
| tree | 7a41c5ce3456ea1070c74b0702583a7675220a3b /app/models/note.rb | |
| parent | 718d919012ec3aa4cedb127a253cce8de4a8e918 (diff) | |
| parent | acdd1bf7c92b7e9cdbd579df8faca5ea7783489f (diff) | |
| download | gitlab-ce-33210-stop-auto-scroll.tar.gz | |
Merge branch 'master' into 33210-stop-auto-scroll33210-stop-auto-scroll
* master: (92 commits)
Responsive table fixes
remove the rouge copypasta and add notes to refactor
nil-check Repository::is_ancestor?
update rouge to 2.1.0
Added more negative checks for public project
Fix End Syntax Error
Enhancing Spec's with negative cases
Improve form spec
Update CHANGELOG.md for 9.0.10
Update CHANGELOG.md for 9.2.5
Fixed spec test syntax errors
Update CHANGELOG.md for 9.1.7
Translate project & repository pages
Converting Tests to Spec Tests
Added more actions and report as abuse to all notes
Add sticky confidential issue bar
Fix for Login Test Problem
Document not using STI
Added Cop to blacklist polymorphic associations
Document not using polymorphic associations
...
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' |