Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-06-09 18:08:05 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-06-09 18:08:05 +0300
commit6ff3eb60e3ddbfe7450b760efe57112ddacbdb69 (patch)
treed998a13cd56f46b28c542661ea5138da0d4a4e05 /app/helpers/application_settings_helper.rb
parentea054ec1c398c2903820284df597ccbd14ec2319 (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.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index d3bdac5be69..38c4cccc417 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -228,6 +228,7 @@ module ApplicationSettingsHelper
:import_sources,
:max_artifacts_size,
:max_attachment_size,
+ :max_import_size,
:max_pages_size,
:metrics_method_call_threshold,
:minimum_password_length,