diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-10-04 02:39:28 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-10-04 02:39:28 +0900 |
| commit | 6d4e28295863fb1969c4785b3c8463c12cafb52f (patch) | |
| tree | 186730b614677e1f4de979d9266e6b8bd8a395ba /config | |
| parent | ab3b36103dd22e0ef0bbaa514901c421d83eb649 (diff) | |
| parent | ea4c3371a738aa5b1825f9ea45ff7fdf64e889f8 (diff) | |
| download | gitlab-ce-6d4e28295863fb1969c4785b3c8463c12cafb52f.tar.gz | |
Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 2 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 4 | ||||
| -rw-r--r-- | config/initializers/devise.rb | 2 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/config/application.rb b/config/application.rb index da9bb25c8b9..30117b6a98e 100644 --- a/config/application.rb +++ b/config/application.rb @@ -105,8 +105,6 @@ module Gitlab config.assets.precompile << "lib/ace.js" config.assets.precompile << "vendor/assets/fonts/*" config.assets.precompile << "test.css" - config.assets.precompile << "new_nav.css" - config.assets.precompile << "new_sidebar.css" # Version of your assets, change this if you want to expire all your assets config.assets.version = '1.0' diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 94429ee91a9..27c1ecc7b23 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -499,9 +499,7 @@ Settings.backup['upload']['storage_class'] ||= nil # Git # Settings['git'] ||= Settingslogic.new({}) -Settings.git['max_size'] ||= 20971520 # 20.megabytes -Settings.git['bin_path'] ||= '/usr/bin/git' -Settings.git['timeout'] ||= 10 +Settings.git['bin_path'] ||= '/usr/bin/git' # Important: keep the satellites.path setting until GitLab 9.0 at # least. This setting is fed to 'rm -rf' in diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 3aed2136f1b..0ba0d791054 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -36,7 +36,7 @@ Devise.setup do |config| # Configure which authentication keys should be case-insensitive. # These keys will be downcased upon creating or modifying a user and when used # to authenticate or find a user. Default is :email. - config.case_insensitive_keys = [:email] + config.case_insensitive_keys = [:email, :email_confirmation] # Configure which authentication keys should have whitespace stripped. # These keys will have whitespace before and after removed upon creating or diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index c60a2baf940..74a08b3f086 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -63,3 +63,5 @@ - [propagate_service_template, 1] - [background_migration, 1] - [manage_cluster, 1] + - [project_migrate_hashed_storage, 1] + - [storage_migrator, 1] |