diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-04-13 16:36:46 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-04-13 16:36:46 -0500 |
| commit | ed490b781f9347b77eb2305e33ba6dd83f3539b0 (patch) | |
| tree | 4f958ce8da072e35ef654cf5ae0a152f613f3ad8 /config/environments/production.rb | |
| parent | a817f084eafaf5527445c29ab1d68f42b1a2872f (diff) | |
| parent | 50529cbceb84e611bca497624a7a4c38113e5135 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: Gemfile.lock config/application.rb
Diffstat (limited to 'config/environments/production.rb')
| -rw-r--r-- | config/environments/production.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/environments/production.rb b/config/environments/production.rb index 7a800db19..2c8471ddd 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -15,6 +15,10 @@ Rails.application.configure do config.action_controller.perform_caching = true config.action_controller.asset_host = ENV['CDN_HOST'] if ENV.key?('CDN_HOST') + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + # Disable serving static files from the `/public` folder by default since # Apache or NGINX already handles this. config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? |