diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
| commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
| tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/models/discussion.rb | |
| parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) | |
| download | gitlab-ce-8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
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, |