require "kaminari-sinatra" after other all gems

sue445 · Feb 12, 2017 · 6284d3d · 6284d3d
1 parent f511a0f
commit 6284d3d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Gemfile b/Gemfile
@@ -39,7 +39,7 @@ gem "activerecord-simple_index_name"
 gem "bundler"
 gem "dalli"
 gem "kaminari-activerecord", ">= 1.0.0"
-gem "kaminari-sinatra", ">= 1.0.0"
+gem "kaminari-sinatra", ">= 1.0.0", require: false
 gem "newrelic_rpm"
 gem "rollbar"
 gem "rroonga"

diff --git a/config/boot.rb b/config/boot.rb
@@ -7,6 +7,12 @@
 require "bundler/setup"
 Bundler.require(:default, RACK_ENV)
 
+# After `require "kaminari/sinatra"`, "Rails" module is defined in rails-html-sanitizer
+# https://github.com/rails/rails-html-sanitizer/blob/v1.0.3/lib/rails/html/sanitizer.rb#L1
+# error occurred following
+# https://github.com/intridea/hashie/blob/v3.5.3/lib/hashie.rb#L60
+require "kaminari/sinatra"
+
 ##
 # ## Enable devel logging
 #