diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-01-07 19:36:57 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-01-07 19:36:57 +0000 |
| commit | d3a100abff561aeaad2752c8f2b3ab88f94926ea (patch) | |
| tree | 481408d898253d85c89c7524fbbd3402ea153ce2 /app/models | |
| parent | 329725c2bd2fe024239707878c2d936f07fca05c (diff) | |
| parent | c4d18b05846b0ca05b6aa5306596478f71752e48 (diff) | |
| download | gitlab-ce-d3a100abff561aeaad2752c8f2b3ab88f94926ea.tar.gz | |
Merge branch 'ce-7407-label-quick-epics' into 'master'
CE port: Use parent instead of project for quick actions
See merge request gitlab-org/gitlab-ce!24124
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/note.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index becf14e9785..1578ae9c4cc 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -456,6 +456,10 @@ class Note < ActiveRecord::Base Upload.find_by(model: self, path: paths) end + def parent + project + end + private def keep_around_commit |