diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 12:07:33 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 12:07:33 +0000 |
| commit | 6b75320f525f841454f1ab162d141d3610f2e77b (patch) | |
| tree | 4971c27759e4fbc18b85e71800c3b9c12346317e /app/models/note.rb | |
| parent | 4226aca420920c1844e8eade4798a2dff188a6fc (diff) | |
| download | gitlab-ce-6b75320f525f841454f1ab162d141d3610f2e77b.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/note.rb')
| -rw-r--r-- | app/models/note.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index 3e645d79e15..43f349c6fa2 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -483,10 +483,9 @@ class Note < ApplicationRecord Upload.find_by(model: self, path: paths) end - def parent + def resource_parent project end - alias_method :resource_parent, :parent private |