Merge branch 'fix/bootstrap-3' into 'master'

Fix/bootstrap 3

See merge request !31

1 files changed, 7 insertions, 0 deletions

diff --git a/config/application.rb b/config/application.rb
index d8e4c82..9534d3e 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -7,6 +7,13 @@ require "action_mailer/railtie"
 require "sprockets/railtie"
 require "rails/test_unit/railtie"
 
+# Require gems that depend on a certain load order
+# client_side_validations modules get included only if active_model is loaded.
+# they will only be included in couchrest_model if that is required last.
+require 'active_model'
+require 'client_side_validations'
+require 'couchrest_model'
+
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)