diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-01 03:08:25 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-01 03:08:25 +0300 |
| commit | e0a8496a094971dae746dae511b6a41d0cdc92c7 (patch) | |
| tree | bec9f08c6fd696caf71e3da31c792d268bc93f9d /app/models/discussion.rb | |
| parent | 5609a96272636cf12b26bd805ad557a72f07ca73 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/discussion.rb')
| -rw-r--r-- | app/models/discussion.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/discussion.rb b/app/models/discussion.rb index c07078c03dd..e928bb0959a 100644 --- a/app/models/discussion.rb +++ b/app/models/discussion.rb @@ -20,6 +20,7 @@ class Discussion :noteable_ability_name, :to_ability_name, :editable?, + :resolved_by_id, :system_note_with_references_visible_for?, :resource_parent, |