summaryrefslogtreecommitdiff
path: root/app/models/project_group_link.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/project_group_link.rb')
-rw-r--r--app/models/project_group_link.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/app/models/project_group_link.rb b/app/models/project_group_link.rb
index bc3759142ae..9021a2b8f66 100644
--- a/app/models/project_group_link.rb
+++ b/app/models/project_group_link.rb
@@ -14,9 +14,9 @@ class ProjectGroupLink < ActiveRecord::Base
validates :project_id, presence: true
validates :group, presence: true
- validates :group_id, uniqueness: { scope: [:project_id], message: "already shared with this group" }
+ validates :group_id, uniqueness: {scope: [:project_id], message: "already shared with this group"}
validates :group_access, presence: true
- validates :group_access, inclusion: { in: Gitlab::Access.values }, presence: true
+ validates :group_access, inclusion: {in: Gitlab::Access.values}, presence: true
validate :different_group
after_commit :refresh_group_members_authorized_projects
@@ -30,20 +30,20 @@ class ProjectGroupLink < ActiveRecord::Base
end
def human_access
- self.class.access_options.key(self.group_access)
+ self.class.access_options.key(group_access)
end
private
def different_group
- return unless self.group && self.project
+ return unless group && project
- project_group = self.project.group
+ project_group = project.group
return unless project_group
group_ids = project_group.ancestors.map(&:id).push(project_group.id)
- if group_ids.include?(self.group.id)
+ if group_ids.include?(group.id)
errors.add(:base, "Project cannot be shared with the group it is in or one of its ancestors.")
end
end