diff --git a/Gemfile b/Gemfile index f74d1174f..58f87fcaa 100644 --- a/Gemfile +++ b/Gemfile @@ -47,6 +47,7 @@ gem "roadie-rails" gem "sass-rails", ">= 3.2" gem "simple_form" gem "simple_form_object" +gem "sprockets-rails", "< 3" # https://github.com/jfirebaugh/konacha/issues/216 gem "turbolinks" gem "uglifier" gem "validates_email_format_of" diff --git a/Gemfile.lock b/Gemfile.lock index f718390ac..a003d65b5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -435,10 +435,10 @@ GEM sprockets (3.5.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.0.0) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) + sprockets-rails (2.3.3) + actionpack (>= 3.0) + activesupport (>= 3.0) + sprockets (>= 2.8, < 4.0) thor (0.19.1) thread_safe (0.3.5) tilt (2.0.2) @@ -540,6 +540,7 @@ DEPENDENCIES site_prism spring spring-commands-rspec + sprockets-rails (< 3) timecop turbolinks uglifier