Commit 2bd7dbf147506253a471ec6a6f359a70726a5d47

Authored by Arthur Nogueira Neves
2 parents e4ba2b7a bc761cd2
Exists in master and in 1 other branch production

Merge pull request #772 from brianvanburken/gemfile_fix

Fix gemfile for Rails 4 assets.
Showing 1 changed file with 8 additions and 10 deletions   Show diff stats
@@ -104,13 +104,11 @@ end @@ -104,13 +104,11 @@ end
104 104
105 # Gems used only for assets and not required 105 # Gems used only for assets and not required
106 # in production environments by default. 106 # in production environments by default.
107 -group :assets do  
108 - gem 'execjs'  
109 - gem 'therubyracer', :platform => :ruby # C Ruby (MRI) or Rubinius, but NOT Windows  
110 - gem 'uglifier', '>= 1.0.3'  
111 - # We can't upgrade because not compatible to jquery >= 1.9.  
112 - # To do that, we need fix the rails.js  
113 - gem 'jquery-rails', '~> 2.1.4'  
114 - gem 'pjax_rails'  
115 - gem 'underscore-rails'  
116 -end 107 +gem 'execjs'
  108 +gem 'therubyracer', :platform => :ruby # C Ruby (MRI) or Rubinius, but NOT Windows
  109 +gem 'uglifier', '>= 1.0.3'
  110 +# We can't upgrade because not compatible to jquery >= 1.9.
  111 +# To do that, we need fix the rails.js
  112 +gem 'jquery-rails', '~> 2.1.4'
  113 +gem 'pjax_rails'
  114 +gem 'underscore-rails'