Commit 998a6982beb6a13210cd911d93f0b23893fdcdcc
Exists in
master
and in
1 other branch
Merge pull request #895 from mgrachev/master
Fix a bug during deploy [assets:precompile]
Showing
2 changed files
with
7 additions
and
0 deletions
Show diff stats
Gemfile
| ... | ... | @@ -99,6 +99,7 @@ group :heroku, :production do |
| 99 | 99 | gem 'unicorn', require: false, platform: 'ruby' |
| 100 | 100 | end |
| 101 | 101 | |
| 102 | +gem 'therubyracer', :platform => :ruby # C Ruby (MRI) or Rubinius, but NOT Windows | |
| 102 | 103 | gem 'sass-rails' |
| 103 | 104 | gem 'coffee-rails' |
| 104 | 105 | gem 'uglifier' | ... | ... |
Gemfile.lock
| ... | ... | @@ -161,6 +161,7 @@ GEM |
| 161 | 161 | launchy (2.4.3-java) |
| 162 | 162 | addressable (~> 2.3) |
| 163 | 163 | spoon (~> 0.0.1) |
| 164 | + libv8 (3.16.14.7) | |
| 164 | 165 | mail (2.6.3) |
| 165 | 166 | mime-types (>= 1.16, < 3) |
| 166 | 167 | meta_request (0.2.8) |
| ... | ... | @@ -280,6 +281,7 @@ GEM |
| 280 | 281 | rake (10.4.2) |
| 281 | 282 | rdoc (4.1.2) |
| 282 | 283 | json (~> 1.4) |
| 284 | + ref (1.0.5) | |
| 283 | 285 | request_store (1.1.0) |
| 284 | 286 | responders (1.1.2) |
| 285 | 287 | railties (>= 3.2, < 4.2) |
| ... | ... | @@ -351,6 +353,9 @@ GEM |
| 351 | 353 | tins (~> 0.8) |
| 352 | 354 | test-unit (3.0.8) |
| 353 | 355 | power_assert |
| 356 | + therubyracer (0.12.2) | |
| 357 | + libv8 (~> 3.16.14.0) | |
| 358 | + ref | |
| 354 | 359 | thor (0.19.1) |
| 355 | 360 | thread_safe (0.3.4) |
| 356 | 361 | thread_safe (0.3.4-java) |
| ... | ... | @@ -443,6 +448,7 @@ DEPENDENCIES |
| 443 | 448 | rushover |
| 444 | 449 | sass-rails |
| 445 | 450 | test-unit |
| 451 | + therubyracer | |
| 446 | 452 | timecop |
| 447 | 453 | uglifier |
| 448 | 454 | underscore-rails | ... | ... |