diff options
| author | elijah <elijah@riseup.net> | 2015-08-12 12:11:30 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2015-08-12 12:11:30 -0700 |
| commit | 8e25ce5e54d13a8bb52a8c209e47b5a9a945f61a (patch) | |
| tree | 965fdf52c176cc5cf413d634ffc39cad3edc8220 | |
| parent | 83ec5213964584e942767251cc6f0c101a1a1e52 (diff) | |
| parent | b457b1f635fb08dd5d76f1536a9e1f9f0affbb6e (diff) | |
Merge branch 'bump-therubyracer' of https://github.com/kaeff/leap_web into develop
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 13 |
2 files changed, 10 insertions, 5 deletions
@@ -44,7 +44,7 @@ group :production do gem "uglifier", "~> 1.2.7" # javascript compression https://github.com/lautis/uglifier # this must not be included in development mode, or js # will get included twice. - gem 'therubyracer', "~> 0.10.2", :platforms => :ruby + gem 'therubyracer', "~> 0.12.2", :platforms => :ruby # ^^ See https://github.com/sstephenson/execjs#readme # for list of supported runtimes. end diff --git a/Gemfile.lock b/Gemfile.lock index 5130347..a185562 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -146,7 +146,7 @@ GEM railties (>= 3.0.0) launchy (2.4.3) addressable (~> 2.3) - libv8 (3.3.10.4) + libv8 (3.16.14.11) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -203,6 +203,7 @@ GEM rdiscount (2.1.7.1) rdoc (3.12.2) json (~> 1.4) + ref (2.0.0) rest-client (1.6.8) mime-types (~> 1.16) rdoc (>= 2.4.2) @@ -226,8 +227,9 @@ GEM tilt (~> 1.1, != 1.3.0) sys-uname (0.9.0) ffi (>= 1.0.0) - therubyracer (0.10.2) - libv8 (~> 3.3.10) + therubyracer (0.12.2) + libv8 (~> 3.16.14.0) + ref thin (1.6.3) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0) @@ -291,7 +293,10 @@ DEPENDENCIES ruby-srp (~> 0.2.1) sass-rails (~> 3.2.5) simple_form - therubyracer (~> 0.10.2) + therubyracer (~> 0.12.2) thin uglifier (~> 1.2.7) valid_email + +BUNDLED WITH + 1.10.6 |