diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-01 12:43:20 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-01 12:43:20 +0200 |
| commit | c91d9b7389c489980fe98812a8f3884b2d41e19e (patch) | |
| tree | 78509567984a32411c661167e254c8645eba2919 /config/boot.rb | |
| parent | 4e60a0d5433f5dfa4f71a452cc5c6ceb0f21ceab (diff) | |
| parent | 5d5d1b528eda560191b2813714c9e461fda3c9d8 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb
Diffstat (limited to 'config/boot.rb')
| -rw-r--r-- | config/boot.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config/boot.rb b/config/boot.rb index 0a3cd4ebe..f82b2be0a 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -1,14 +1,14 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) -require 'bundler/setup' # Set up gems listed in the Gemfile. -require 'bootsnap' # Speed up boot time by caching expensive operations. +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. Bootsnap.setup( cache_dir: 'tmp/cache', - development_mode: ENV['RAILS_ENV'] == 'development', + development_mode: ENV.fetch('RAILS_ENV', 'development') == 'development', load_path_cache: true, autoload_paths_cache: true, - disable_trace: true, + disable_trace: false, compile_cache_iseq: false, compile_cache_yaml: false ) |