diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 00:09:12 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 00:09:12 +0000 |
commit | d43aaf286fe6b8e8383e73ea580274d8841608d7 (patch) | |
tree | ca03542a55583538a1ec13023dffed20457407b5 /app/models/discussion.rb | |
parent | 87af6f2e0590af0ed1bb3e5de1bb5d21855a94d2 (diff) | |
download | gitlab-ce-d43aaf286fe6b8e8383e73ea580274d8841608d7.tar.gz |
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 5c45c5fb7fb..c07078c03dd 100644 --- a/app/models/discussion.rb +++ b/app/models/discussion.rb @@ -14,6 +14,7 @@ class Discussion :author, :noteable, :commit_id, + :confidential?, :for_commit?, :for_merge_request?, :noteable_ability_name, |