summaryrefslogtreecommitdiff
path: root/app/models/group_group_link.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-03 00:09:03 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-03 00:09:03 +0000
commita2a712139fc7fa58aa02b143f2767286d28ef28d (patch)
treeb62661ce7c26bfa679bec8f360c99b8214ec4ae5 /app/models/group_group_link.rb
parentedfec24c1d7adefa03568c97b50f730a6196f9d2 (diff)
downloadgitlab-ce-a2a712139fc7fa58aa02b143f2767286d28ef28d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/group_group_link.rb')
-rw-r--r--app/models/group_group_link.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/group_group_link.rb b/app/models/group_group_link.rb
index 5a0d9b08cb0..58c188369da 100644
--- a/app/models/group_group_link.rb
+++ b/app/models/group_group_link.rb
@@ -10,11 +10,11 @@ class GroupGroupLink < ApplicationRecord
validates :shared_group_id, uniqueness: { scope: [:shared_with_group_id],
message: _('The group has already been shared with this group') }
validates :shared_with_group, presence: true
- validates :group_access, inclusion: { in: Gitlab::Access.values },
+ validates :group_access, inclusion: { in: Gitlab::Access.all_values },
presence: true
def self.access_options
- Gitlab::Access.options
+ Gitlab::Access.options_with_owner
end
def self.default_access