diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-09-29 18:34:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-29 18:34:36 +0200 |
| commit | e09301f4140ed458d7335f7f22df6c2591cc99cc (patch) | |
| tree | c6d1a6594e78567aac4082e09e5c1f13a00b6fab | |
| parent | ac07bfb018b61dd1d9e6c47d4ebafe822d606e59 (diff) | |
| download | mastodon-e09301f4140ed458d7335f7f22df6c2591cc99cc.tar mastodon-e09301f4140ed458d7335f7f22df6c2591cc99cc.tar.gz mastodon-e09301f4140ed458d7335f7f22df6c2591cc99cc.tar.bz2 mastodon-e09301f4140ed458d7335f7f22df6c2591cc99cc.zip | |
Adjust bootsnap configuration for newer version (#8826)
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | config/boot.rb | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -24,7 +24,7 @@ gem 'streamio-ffmpeg', '~> 3.0' gem 'active_model_serializers', '~> 0.10' gem 'addressable', '~> 2.5' -gem 'bootsnap', '~> 1.3' +gem 'bootsnap', '~> 1.3', require: false gem 'browser' gem 'charlock_holmes', '~> 0.7.6' gem 'iso-639' 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 ) |