diff --git a/Gemfile b/Gemfile index bf3570b803..7c5957546f 100644 --- a/Gemfile +++ b/Gemfile @@ -108,7 +108,7 @@ gem 'whenever', require: false gem 'test-unit', '~> 3.3' -gem 'coffee-rails', '~> 4.0.0' +gem 'coffee-rails', '~> 4.2.2' gem 'compass-rails' gem 'mini_racer', '0.2.14' diff --git a/Gemfile.lock b/Gemfile.lock index ee01f6b3a6..9f0e10d82a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -170,9 +170,9 @@ GEM cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) coderay (1.1.2) - coffee-rails (4.0.1) + coffee-rails (4.2.2) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.0) + railties (>= 4.0.0) coffee-script (2.4.1) coffee-script-source execjs @@ -713,7 +713,7 @@ DEPENDENCIES cancan (~> 1.6.10) capybara (>= 2.18.0) catalog! - coffee-rails (~> 4.0.0) + coffee-rails (~> 4.2.2) combine_pdf compass-rails custom_error_message!