diff options
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/group.rb | 3 | ||||
-rw-r--r-- | app/models/issue.rb | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/app/models/group.rb b/app/models/group.rb index e9b3e3c3369..f21d32e304d 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -70,6 +70,9 @@ class Group < Namespace validates :variables, variable_duplicates: true validates :two_factor_grace_period, presence: true, numericality: { greater_than_or_equal_to: 0 } + validates :name, + format: { with: Gitlab::Regex.group_name_regex, + message: Gitlab::Regex.group_name_regex_message } add_authentication_token_field :runners_token, encrypted: -> { Feature.enabled?(:groups_tokens_optional_encryption, default_enabled: true) ? :optional : :required } diff --git a/app/models/issue.rb b/app/models/issue.rb index 145807457a1..b2bc3610035 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -327,10 +327,8 @@ class Issue < ApplicationRecord true elsif project.owner == user true - elsif confidential? - author == user || - assignees.include?(user) || - project.team.member?(user, Gitlab::Access::REPORTER) + elsif confidential? && !assignee_or_author?(user) + project.team.member?(user, Gitlab::Access::REPORTER) else project.public? || project.internal? && !user.external? || |