diff --git a/Gemfile b/Gemfile index 34766dd150..e949e203a4 100644 --- a/Gemfile +++ b/Gemfile @@ -33,10 +33,7 @@ gem 'nokogiri' # style gem 'bootstrap-sass', '~> 3.4' gem 'sass-rails', '5.0.6' # sass style - -# js - -gem 'coffee-rails', '4.1.0' # coffeescript support +gem 'coffee-rails', '~> 4.2' gem 'jquery-rails', '4.0.4' # jquery gem 'selectize-rails', '0.12.1' # include selectize.js for select diff --git a/Gemfile.lock b/Gemfile.lock index 0dbb10328a..94f1d16b19 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -147,9 +147,9 @@ GEM coderay (1.1.0) coercible (1.0.0) descendants_tracker (~> 0.0.1) - coffee-rails (4.1.0) + 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 @@ -466,7 +466,7 @@ DEPENDENCIES cancancan capybara coderay (= 1.1.0) - coffee-rails (= 4.1.0) + coffee-rails (~> 4.2) company_register! countries daemons-rails (= 1.2.1)