From b782a3406ddfb8590e03ef641cd66b3c2474b4ba Mon Sep 17 00:00:00 2001 From: Fernando Brito Date: Wed, 28 May 2014 15:01:09 -0300 Subject: [PATCH] Update gem versions --- Gemfile | 6 +++--- Gemfile.lock | 30 ++++++++++++++++-------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/Gemfile b/Gemfile index 2ec0ef1..41a1eae 100644 --- a/Gemfile +++ b/Gemfile @@ -8,15 +8,15 @@ gem 'activeadmin', github: 'gregbell/active_admin' gem 'haml-rails' gem 'sass-rails', '~> 4.0.3' -# gem 'bootstrap-sass' gem 'twitter-bootstrap-rails' gem 'less-rails' -gem 'httmultiparty' - gem 'uglifier', '>= 1.3.0' gem 'coffee-rails', '~> 4.0.0' gem 'jquery-rails' + +gem 'httmultiparty' + gem 'therubyracer', :platform => :ruby gem 'websocket-rails' diff --git a/Gemfile.lock b/Gemfile.lock index cd97abb..3ec9c0c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -202,12 +202,12 @@ GEM activesupport (>= 3.0.0) launchy (2.4.2) addressable (~> 2.3) - less (2.2.2) - commonjs (~> 0.2.6) - less-rails (2.2.6) + less (2.5.0) + commonjs (~> 0.2.7) + less-rails (2.5.0) actionpack (>= 3.1) - less (~> 2.2.0) - libv8 (3.3.10.4) + less (~> 2.5.0) + libv8 (3.16.14.3) listen (2.7.4) celluloid (>= 0.15.2) celluloid-io (>= 0.15.0) @@ -221,7 +221,7 @@ GEM mime-types (1.25.1) mimemagic (0.2.1) mini_portile (0.5.3) - minitest (5.3.3) + minitest (5.3.4) multi_json (1.10.0) multi_xml (0.5.5) multipart-post (2.0.0) @@ -270,7 +270,7 @@ GEM activesupport (= 4.1.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.3.1) + rake (10.3.2) ransack (1.2.3) actionpack (>= 3.0) activerecord (>= 3.0) @@ -285,6 +285,7 @@ GEM redis (3.0.7) redis-objects (0.9.1) redis (>= 3.0.2) + ref (1.0.5) responders (1.0.0) railties (>= 3.2, < 5) rolify (3.4.0) @@ -346,25 +347,26 @@ GEM activesupport (>= 3.0) sprockets (~> 2.8) sqlite3 (1.3.9) - therubyracer (0.10.2) - libv8 (~> 3.3.10) + therubyracer (0.12.1) + libv8 (~> 3.16.14.0) + ref thin (1.6.2) daemons (>= 1.0.9) eventmachine (>= 1.0.0) rack (>= 1.0.0) thor (0.19.1) - thread_safe (0.3.3) + thread_safe (0.3.4) tilt (1.4.1) timers (1.1.0) treetop (1.4.15) polyglot polyglot (>= 0.3.1) - twitter-bootstrap-rails (2.0.9) + twitter-bootstrap-rails (2.2.8) actionpack (>= 3.1) - less-rails (~> 2.2.2) + execjs + rails (>= 3.1) railties (>= 3.1) - therubyracer (~> 0.10.1) - tzinfo (1.1.0) + tzinfo (1.2.0) thread_safe (~> 0.1) uglifier (2.5.0) execjs (>= 0.3.0) -- libgit2 0.21.2