diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-16 06:13:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-16 06:13:19 +0300 |
| commit | 0e6ff93eba3ed1ba4c7be0ec78a76dde71a47285 (patch) | |
| tree | 5644055ecab86d9f68a1ac701ca8ac8e9219ce77 /config/initializers | |
| parent | d746accf38bc9304f29c2bc4a70dfdc6565170f7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index c3ee7e06396..9b9132e2497 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -218,6 +218,7 @@ Settings.gitlab['impersonation_enabled'] ||= true if Settings.gitlab['impersonat Settings.gitlab['usage_ping_enabled'] = true if Settings.gitlab['usage_ping_enabled'].nil? Settings.gitlab['max_request_duration_seconds'] ||= 57 Settings.gitlab['display_initial_root_password'] = false if Settings.gitlab['display_initial_root_password'].nil? +Settings.gitlab['weak_passwords_digest_set'] ||= YAML.safe_load(File.open(Rails.root.join('config', 'weak_password_digests.yml')), permitted_classes: [String]).to_set.freeze Gitlab.ee do Settings.gitlab['mirror_max_delay'] ||= 300 |