diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-25 15:09:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-25 15:09:24 +0300 |
| commit | 7a3aca2b5b3bfdebbd7bb6353d5bdcdc422670da (patch) | |
| tree | d3431811140c48c2ed31f2e8fdc90504f3bd4344 /app/models | |
| parent | 9c3a433b3176e895a23cf0f4b87411b44e264397 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/application_setting_implementation.rb | 1 | ||||
| -rw-r--r-- | app/models/clusters/agent_token.rb | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/app/models/application_setting_implementation.rb b/app/models/application_setting_implementation.rb index 5a90e246499..8ed24257d61 100644 --- a/app/models/application_setting_implementation.rb +++ b/app/models/application_setting_implementation.rb @@ -51,6 +51,7 @@ module ApplicationSettingImplementation container_registry_token_expire_delay: 5, container_registry_vendor: '', container_registry_version: '', + container_registry_db_enabled: false, custom_http_clone_url_root: nil, decompress_archive_file_timeout: 210, default_artifacts_expire_in: '30 days', diff --git a/app/models/clusters/agent_token.rb b/app/models/clusters/agent_token.rb index f4c497a42cc..e2754db73b9 100644 --- a/app/models/clusters/agent_token.rb +++ b/app/models/clusters/agent_token.rb @@ -33,6 +33,10 @@ module Clusters revoked: 1 } + def revoke! + update(status: :revoked) + end + def to_ability_name :cluster end |