From 43c241219dc30f991e6500f035f93ce3f233f8c6 Mon Sep 17 00:00:00 2001 From: Miles Gould Date: Sat, 13 Dec 2014 11:54:03 +0000 Subject: [PATCH 1/2] Update .ruby-version to match Gemfile. --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index eca07e4c1..cd57a8b95 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.1.2 +2.1.5 From c446ea92328328fca6b4eacc1a2f1c57164ba5f5 Mon Sep 17 00:00:00 2001 From: Miles Gould Date: Sat, 13 Dec 2014 11:54:45 +0000 Subject: [PATCH 2/2] Upgrade libv8 to v3.16.14.7. The old version was breaking `bundle install` on OS X. --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 3fed461ad..36da0c2c0 100644 --- a/Gemfile +++ b/Gemfile @@ -51,7 +51,7 @@ group :assets do # for now as it's easier for new people to install gem "therubyracer", "~> 0.12", :platforms => :ruby # libv8 is needed by therubyracer and is a bit finicky - gem 'libv8', '3.16.14.3' + gem 'libv8', '3.16.14.7' # Another CSS preprocessor, used for Bootstrap overrides gem "less", '~>2.5.0' diff --git a/Gemfile.lock b/Gemfile.lock index 06c2b60e0..8a053b509 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -183,7 +183,7 @@ GEM less-rails (~> 2.5.0) letter_opener (1.2.0) launchy (~> 2.2) - libv8 (3.16.14.3) + libv8 (3.16.14.7) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -360,7 +360,7 @@ DEPENDENCIES less-rails (~> 2.5.0) less-rails-bootstrap (~> 3.2.0) letter_opener - libv8 (= 3.16.14.3) + libv8 (= 3.16.14.7) memcachier newrelic_rpm omniauth