diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-27 10:15:59 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-27 10:16:27 +0000 |
| commit | eff560cfb9a337623d25b912d9bb233fae25fbf1 (patch) | |
| tree | dd96ba1b42ddc1cdc588c0ff4096a4d47d0b5e0d /app/models | |
| parent | 14b92217e768aa4f3ce2d8b30f2c2acbdfdd8f6a (diff) | |
| download | gitlab-ce-eff560cfb9a337623d25b912d9bb233fae25fbf1.tar.gz | |
Add latest changes from gitlab-org/security/gitlab@14-4-stable-ee
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/concerns/resolvable_discussion.rb | 3 | ||||
| -rw-r--r-- | app/models/project_group_link.rb | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/concerns/resolvable_discussion.rb b/app/models/concerns/resolvable_discussion.rb index 3e1e5faee54..60e1dde17b9 100644 --- a/app/models/concerns/resolvable_discussion.rb +++ b/app/models/concerns/resolvable_discussion.rb @@ -81,8 +81,7 @@ module ResolvableDiscussion return false unless current_user return false unless resolvable? - current_user == self.noteable.try(:author) || - current_user.can?(:resolve_note, self.project) + current_user.can?(:resolve_note, self.noteable) end def resolve!(current_user) diff --git a/app/models/project_group_link.rb b/app/models/project_group_link.rb index d704f4c2c87..8394ebe1df4 100644 --- a/app/models/project_group_link.rb +++ b/app/models/project_group_link.rb @@ -15,6 +15,7 @@ class ProjectGroupLink < ApplicationRecord validate :different_group scope :non_guests, -> { where('group_access > ?', Gitlab::Access::GUEST) } + scope :in_group, -> (group_ids) { where(group_id: group_ids) } alias_method :shared_with_group, :group |