diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-30 15:09:45 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-30 15:09:45 +0300 |
| commit | 04edf6545802ed0515e221038b63fc96ad3e6d54 (patch) | |
| tree | d0eed6d065f7f5a7dcfc8f6bd7a1cebd4aae0167 /config | |
| parent | ada214dc52b53bd9eb3a79c279506f91c547f721 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/cable.yml.example | 14 | ||||
| -rw-r--r-- | config/environments/production.rb | 3 |
2 files changed, 17 insertions, 0 deletions
diff --git a/config/cable.yml.example b/config/cable.yml.example new file mode 100644 index 00000000000..ee3a8da9be8 --- /dev/null +++ b/config/cable.yml.example @@ -0,0 +1,14 @@ +# This file is used for configuring ActionCable in our CI environment +# When using GDK or Omnibus, cable.yml is generated from a different template +development: + adapter: redis + url: redis://localhost:6379 + channel_prefix: gitlab_development +test: + adapter: redis + url: redis://localhost:6379 + channel_prefix: gitlab_test +production: + adapter: redis + url: unix:/var/run/redis/redis.sock + channel_prefix: gitlab_production diff --git a/config/environments/production.rb b/config/environments/production.rb index 7ec18547b2f..c03421040a3 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -52,6 +52,9 @@ Rails.application.configure do # Enable serving of images, stylesheets, and JavaScripts from an asset server config.action_controller.asset_host = ENV['GITLAB_CDN_HOST'] if ENV['GITLAB_CDN_HOST'].present? + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false + # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added) # config.assets.precompile += %w( search.js ) |