Download as
Browse Code »

Commit 65d15f6cdf4ae91c9d20e634e72af90e22c55611

Authored by Arthur Neves
1 parent bd2fd5f1
Exists in master and in 1 other branch production

Use more modern assets gems

Showing 2 changed files with 20 additions and 14 deletions   Show diff stats
@@ -93,12 +93,9 @@ group :heroku, :production do @@ -93,12 +93,9 @@ group :heroku, :production do
93 gem 'unicorn', :require => false 93 gem 'unicorn', :require => false
94 end 94 end
95 95
96 -  
97 -# Gems used only for assets and not required  
98 -# in production environments by default.  
99 -gem 'execjs'  
100 -gem 'therubyracer', :platform => :ruby # C Ruby (MRI) or Rubinius, but NOT Windows  
101 -gem 'uglifier', '>= 1.0.3' 96 +gem 'sass-rails'
  97 +gem 'coffee-rails'
  98 +gem 'uglifier'
102 # We can't upgrade because not compatible to jquery >= 1.9. 99 # We can't upgrade because not compatible to jquery >= 1.9.
103 # To do that, we need fix the rails.js 100 # To do that, we need fix the rails.js
104 gem 'jquery-rails', '~> 2.1.4' 101 gem 'jquery-rails', '~> 2.1.4'
@@ -72,6 +72,13 @@ GEM @@ -72,6 +72,13 @@ GEM
72 xpath (~> 2.0) 72 xpath (~> 2.0)
73 cliver (0.3.2) 73 cliver (0.3.2)
74 coderay (1.0.9) 74 coderay (1.0.9)
  75 + coffee-rails (4.1.0)
  76 + coffee-script (>= 2.2.0)
  77 + railties (>= 4.0.0, < 5.0)
  78 + coffee-script (2.3.0)
  79 + coffee-script-source
  80 + execjs
  81 + coffee-script-source (1.8.0)
75 connection_pool (2.1.0) 82 connection_pool (2.1.0)
76 coveralls (0.7.0) 83 coveralls (0.7.0)
77 multi_json (~> 1.3) 84 multi_json (~> 1.3)
@@ -144,7 +151,6 @@ GEM @@ -144,7 +151,6 @@ GEM
144 kgio (2.8.1) 151 kgio (2.8.1)
145 launchy (2.3.0) 152 launchy (2.3.0)
146 addressable (~> 2.3) 153 addressable (~> 2.3)
147 - libv8 (3.16.14.7)  
148 mail (2.6.3) 154 mail (2.6.3)
149 mime-types (>= 1.16, < 3) 155 mime-types (>= 1.16, < 3)
150 meta_request (0.2.8) 156 meta_request (0.2.8)
@@ -252,7 +258,6 @@ GEM @@ -252,7 +258,6 @@ GEM
252 rake (10.4.2) 258 rake (10.4.2)
253 rdoc (4.1.2) 259 rdoc (4.1.2)
254 json (~> 1.4) 260 json (~> 1.4)
255 - ref (1.0.5)  
256 request_store (1.0.6) 261 request_store (1.0.6)
257 rest-client (1.6.8) 262 rest-client (1.6.8)
258 mime-types (~> 1.16) 263 mime-types (~> 1.16)
@@ -277,6 +282,13 @@ GEM @@ -277,6 +282,13 @@ GEM
277 json 282 json
278 rest-client 283 rest-client
279 safe_yaml (1.0.4) 284 safe_yaml (1.0.4)
  285 + sass (3.4.9)
  286 + sass-rails (5.0.1)
  287 + railties (>= 4.0.0, < 5.0)
  288 + sass (~> 3.1)
  289 + sprockets (>= 2.8, < 4.0)
  290 + sprockets-rails (>= 2.0, < 4.0)
  291 + tilt (~> 1.1)
280 sawyer (0.6.0) 292 sawyer (0.6.0)
281 addressable (~> 2.3.5) 293 addressable (~> 2.3.5)
282 faraday (~> 0.8, < 0.10) 294 faraday (~> 0.8, < 0.10)
@@ -296,9 +308,6 @@ GEM @@ -296,9 +308,6 @@ GEM
296 sprockets (>= 2.8, < 4.0) 308 sprockets (>= 2.8, < 4.0)
297 term-ansicolor (1.2.2) 309 term-ansicolor (1.2.2)
298 tins (~> 0.8) 310 tins (~> 0.8)
299 - therubyracer (0.12.1)  
300 - libv8 (~> 3.16.14.0)  
301 - ref  
302 thor (0.19.1) 311 thor (0.19.1)
303 thread_safe (0.3.4) 312 thread_safe (0.3.4)
304 tilt (1.4.1) 313 tilt (1.4.1)
@@ -338,6 +347,7 @@ DEPENDENCIES @@ -338,6 +347,7 @@ DEPENDENCIES
338 campy 347 campy
339 capistrano (~> 2.0) 348 capistrano (~> 2.0)
340 capybara 349 capybara
  350 + coffee-rails
341 coveralls 351 coveralls
342 database_cleaner 352 database_cleaner
343 decent_exposure 353 decent_exposure
@@ -346,7 +356,6 @@ DEPENDENCIES @@ -346,7 +356,6 @@ DEPENDENCIES
346 email_spec 356 email_spec
347 errbit_github_plugin! 357 errbit_github_plugin!
348 errbit_plugin! 358 errbit_plugin!
349 - execjs  
350 fabrication 359 fabrication
351 flowdock 360 flowdock
352 foreman 361 foreman
@@ -377,9 +386,9 @@ DEPENDENCIES @@ -377,9 +386,9 @@ DEPENDENCIES
377 ri_cal 386 ri_cal
378 rspec-rails 387 rspec-rails
379 rushover 388 rushover
380 - therubyracer 389 + sass-rails
381 timecop 390 timecop
382 - uglifier (>= 1.0.3) 391 + uglifier
383 underscore-rails 392 underscore-rails
384 unicorn 393 unicorn
385 useragent 394 useragent