diff options
Diffstat (limited to 'app/models/group.rb')
| -rw-r--r-- | app/models/group.rb | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/app/models/group.rb b/app/models/group.rb index 52f503404af..5ef7a211318 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'carrierwave/orm/activerecord' +require "carrierwave/orm/activerecord" class Group < Namespace include Gitlab::ConfigHelper @@ -17,15 +17,15 @@ class Group < Namespace include Gitlab::Utils::StrongMemoize has_many :group_members, -> { where(requested_at: nil) }, dependent: :destroy, as: :source # rubocop:disable Cop/ActiveRecordDependent - alias_method :members, :group_members + alias members group_members has_many :users, through: :group_members has_many :owners, - -> { where(members: { access_level: Gitlab::Access::OWNER }) }, + -> { where(members: {access_level: Gitlab::Access::OWNER}) }, through: :group_members, source: :user - has_many :requesters, -> { where.not(requested_at: nil) }, dependent: :destroy, as: :source, class_name: 'GroupMember' # rubocop:disable Cop/ActiveRecordDependent - has_many :members_and_requesters, as: :source, class_name: 'GroupMember' + has_many :requesters, -> { where.not(requested_at: nil) }, dependent: :destroy, as: :source, class_name: "GroupMember" # rubocop:disable Cop/ActiveRecordDependent + has_many :members_and_requesters, as: :source, class_name: "GroupMember" has_many :milestones has_many :project_group_links, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent @@ -35,15 +35,15 @@ class Group < Namespace # Left here just to be dependent: :destroy has_many :notification_settings, dependent: :destroy, as: :source # rubocop:disable Cop/ActiveRecordDependent - has_many :labels, class_name: 'GroupLabel' - has_many :variables, class_name: 'Ci::GroupVariable' - has_many :custom_attributes, class_name: 'GroupCustomAttribute' + has_many :labels, class_name: "GroupLabel" + has_many :variables, class_name: "Ci::GroupVariable" + has_many :custom_attributes, class_name: "GroupCustomAttribute" has_many :boards - has_many :badges, class_name: 'GroupBadge' + has_many :badges, class_name: "GroupBadge" - has_many :cluster_groups, class_name: 'Clusters::Group' - has_many :clusters, through: :cluster_groups, class_name: 'Clusters::Cluster' + has_many :cluster_groups, class_name: "Clusters::Group" + has_many :clusters, through: :cluster_groups, class_name: "Clusters::Cluster" has_many :todos @@ -54,7 +54,7 @@ class Group < Namespace validate :visibility_level_allowed_by_parent validates :variables, variable_duplicates: true - validates :two_factor_grace_period, presence: true, numericality: { greater_than_or_equal_to: 0 } + validates :two_factor_grace_period, presence: true, numericality: {greater_than_or_equal_to: 0} add_authentication_token_field :runners_token, encrypted: true, migrating: true @@ -65,10 +65,10 @@ class Group < Namespace class << self def sort_by_attribute(method) - if method == 'storage_size_desc' + if method == "storage_size_desc" # storage_size is a virtual column so we need to # pass a string to avoid AR adding the table name - reorder('storage_size DESC, namespaces.id DESC') + reorder("storage_size DESC, namespaces.id DESC") else order_by(method) end @@ -97,8 +97,8 @@ class Group < Namespace def select_for_project_authorization if current_scope.joins_values.include?(:shared_projects) - joins('INNER JOIN namespaces project_namespace ON project_namespace.id = projects.namespace_id') - .where('project_namespace.share_with_group_lock = ?', false) + joins("INNER JOIN namespaces project_namespace ON project_namespace.id = projects.namespace_id") + .where("project_namespace.share_with_group_lock = ?", false) .select("projects.id AS project_id, LEAST(project_group_links.group_access, members.access_level) AS access_level") else super @@ -108,13 +108,13 @@ class Group < Namespace private def public_to_user_arel(user) - self.arel_table[:visibility_level] + arel_table[:visibility_level] .in(Gitlab::VisibilityLevel.levels_for_user(user)) end def visible_to_user_arel(user) - groups_table = self.arel_table - authorized_groups = user.authorized_groups.as('authorized') + groups_table = arel_table + authorized_groups = user.authorized_groups.as("authorized") groups_table.project(1) .from(authorized_groups) @@ -144,21 +144,21 @@ class Group < Namespace full_name end - def visibility_level_allowed_by_parent?(level = self.visibility_level) - return true unless parent_id && parent_id.nonzero? + def visibility_level_allowed_by_parent?(level = visibility_level) + return true unless parent_id&.nonzero? level <= parent.visibility_level end - def visibility_level_allowed_by_projects?(level = self.visibility_level) - !projects.where('visibility_level > ?', level).exists? + def visibility_level_allowed_by_projects?(level = visibility_level) + !projects.where("visibility_level > ?", level).exists? end - def visibility_level_allowed_by_sub_groups?(level = self.visibility_level) - !children.where('visibility_level > ?', level).exists? + def visibility_level_allowed_by_sub_groups?(level = visibility_level) + !children.where("visibility_level > ?", level).exists? end - def visibility_level_allowed?(level = self.visibility_level) + def visibility_level_allowed?(level = visibility_level) visibility_level_allowed_by_parent?(level) && visibility_level_allowed_by_projects?(level) && visibility_level_allowed_by_sub_groups?(level) @@ -213,7 +213,7 @@ class Group < Namespace end # @deprecated - alias_method :add_master, :add_maintainer + alias add_master add_maintainer def add_owner(user, current_user = nil) add_user(user, :owner, current_user: current_user) @@ -238,7 +238,7 @@ class Group < Namespace end # @deprecated - alias_method :has_master?, :has_maintainer? + alias has_master? has_maintainer? # Check if user is a last owner of the group. # Parent owners are ignored for nested groups. @@ -334,7 +334,7 @@ class Group < Namespace User .where(id: direct_and_indirect_members.select(:user_id)) .reorder(nil), - project_users_with_descendants + project_users_with_descendants, ]) end @@ -343,7 +343,7 @@ class Group < Namespace def project_users_with_descendants User .joins(projects: :group) - .where(namespaces: { id: self_and_descendants.select(:id) }) + .where(namespaces: {id: self_and_descendants.select(:id)}) end def max_member_access_for_user(user) @@ -352,8 +352,8 @@ class Group < Namespace members_with_parents .where(user_id: user) .reorder(access_level: :desc) - .first&. - access_level || GroupMember::NO_ACCESS + .first + &.access_level || GroupMember::NO_ACCESS end def mattermost_team_params @@ -362,7 +362,7 @@ class Group < Namespace { name: path[0..max_length], display_name: name[0..max_length], - type: public? ? 'O' : 'I' # Open vs Invite-only + type: public? ? "O" : "I", # Open vs Invite-only } end |