diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-02 12:10:23 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-02 12:10:23 +0300 |
| commit | 4b9ace6c1fead1b44f173eaee0cfaa58f46a258a (patch) | |
| tree | a411c934419690755623a57ff7ea5f47050050e2 /app/helpers/application_settings_helper.rb | |
| parent | 03a521732276f8abc4ba069dd985b22cd9bc5929 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/application_settings_helper.rb')
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index d68ae1a56ca..7b73af4bd09 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -327,7 +327,8 @@ module ApplicationSettingsHelper :group_import_limit, :group_export_limit, :group_download_export_limit, - :wiki_page_max_content_bytes + :wiki_page_max_content_bytes, + :container_registry_delete_tags_service_timeout ] end |