diff --git a/.ruby-version b/.ruby-version index 6b751b7289..cd57a8b95d 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.0.0-p481 +2.1.5 diff --git a/Gemfile b/Gemfile index b937a0d3f6..f51eb993c4 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -ruby "2.0.0" +ruby "2.1.5" gem 'rails', '3.2.21' gem 'rails-i18n', '~> 3.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index b2ed09a169..c886298743 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -251,7 +251,7 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0.5.3) erubis (2.7.0) - eventmachine (1.0.3) + eventmachine (1.0.8) excon (0.25.3) execjs (2.5.2) factory_girl (3.3.0) @@ -334,7 +334,7 @@ GEM addressable (~> 2.3) letter_opener (1.0.0) launchy (>= 2.0.4) - libv8 (3.16.14.3) + libv8 (3.16.14.11) listen (2.2.0) celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3)