diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
| commit | 0c872e02b2c822e3397515ec324051ff540f0cd5 (patch) | |
| tree | ce2fb6ce7030e4dad0f4118d21ab6453e5938cdd /app/models/group_deploy_key.rb | |
| parent | f7e05a6853b12f02911494c4b3fe53d9540d74fc (diff) | |
Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42
Diffstat (limited to 'app/models/group_deploy_key.rb')
| -rw-r--r-- | app/models/group_deploy_key.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/models/group_deploy_key.rb b/app/models/group_deploy_key.rb index c65b00a6de0..9495df7ab6d 100644 --- a/app/models/group_deploy_key.rb +++ b/app/models/group_deploy_key.rb @@ -12,6 +12,11 @@ class GroupDeployKey < Key joins(:group_deploy_keys_groups).where(group_deploy_keys_groups: { group_id: group_ids }).uniq end + # Remove usage_type because it defined in Key class but doesn't have a column in group_deploy_keys table + def self.defined_enums + super.without('usage_type') + end + def type 'DeployKey' end |