diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-30 17:12:50 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-31 13:23:13 +0200 |
| commit | 846d111f1d07e62e295ea778b85ada9088be2f31 (patch) | |
| tree | 283a58e566cdaa42d003875713940daaaa2635ec /lib | |
| parent | ba81c91255aac2d724ceb94e3eb91f912227e2eb (diff) | |
| download | gitlab-ce-846d111f1d07e62e295ea778b85ada9088be2f31.tar.gz | |
Add Application Setting to configure Container Registry token expire delay (default 5min)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/entities.rb | 1 | ||||
| -rw-r--r-- | lib/gitlab/current_settings.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 31491cf31dd..790a1869f73 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -362,6 +362,7 @@ module API expose :restricted_signup_domains expose :user_oauth_applications expose :after_sign_out_path + expose :container_registry_token_expire_delay end class Release < Grape::Entity diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index f44d1b3a44e..29c4e221dd4 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -36,6 +36,7 @@ module Gitlab two_factor_grace_period: 48, akismet_enabled: false, repository_checks_enabled: true, + container_registry_token_expire_delay: 5, ) end |