Merge branch 'master' into master-legacy

berkmancenter · Nov 15, 2019 · cf19149 · cf19149
2 parents 864f970 + 7fb6104
commit cf19149
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -34,7 +34,7 @@ gem 'paperclip', '~> 5'
 gem 'pg', '~> 1.1.4'
 gem 'rack'
 gem 'rack-attack'
-gem 'rack-mini-profiler', require: false
+gem 'rack-mini-profiler'
 gem 'rails', '~> 5.2.0'
 gem 'rails_admin'
 gem 'rails_admin_tag_list', git: 'https://github.com/berkmancenter/rails_admin_tag_list'

diff --git a/config/initializers/mini-profiler.rb b/config/initializers/mini-profiler.rb
@@ -1,7 +1,6 @@
-require 'rack-mini-profiler'
-
-# If using Rack::Deflater (e.g. set in config/application.rb), this must be after it,
-# so we use require: false in the Gemfile and then require it here.
+# require 'rack-mini-profiler'
+# If using Rack::Deflater (e.g. set in config/application.rb), this must be
+# after it, so use require: false in the Gemfile and then require it here.
 # Rails.application.config.middleware.insert_after Rack::Deflater, Rack::MiniProfiler
 
 Rack::MiniProfiler.config.authorization_mode = :whitelist if Rails.env.production?