From 3fc4dce87cce6e2dd71407c443e9bc5054d61039 Mon Sep 17 00:00:00 2001 From: echarp Date: Sat, 17 May 2014 11:47:15 +0200 Subject: [PATCH] Bundle update --- Gemfile.lock | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f847c98a..813035e5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,13 +1,13 @@ GIT remote: git://github.com/activerecord-hackery/polyamorous.git - revision: 49b2607c14583fb35189f74dce05e0dd3bcf0bd8 + revision: 69ce1f436ee93dcb011631bb727a6e3ab38a27f4 specs: polyamorous (1.0.0) activerecord (>= 3.0) GIT remote: git://github.com/activerecord-hackery/ransack.git - revision: a4b7be58eb6d6dcff5082d7c945f3d08fe4ec263 + revision: 79fe700bca7d69f30a44898635fdddd3a8ef486d branch: rails-4.1 specs: ransack (1.2.4) @@ -26,7 +26,7 @@ GIT GIT remote: git://github.com/gregbell/active_admin.git - revision: ad33a0f6c772e74a23232baa7db0b3db2fe19db2 + revision: 27c570994c1c58b070a3a2b97d9f67fb41b78ce9 specs: activeadmin (1.0.0.pre) arbre (~> 1.0) @@ -93,9 +93,6 @@ GEM builder (3.2.2) celluloid (0.15.2) timers (~> 1.1.0) - celluloid-io (0.15.0) - celluloid (>= 0.15.0) - nio4r (>= 0.5.0) chunky_png (1.3.1) coderay (1.1.0) coffee-rails (4.0.1) @@ -120,7 +117,7 @@ GEM eventmachine (1.0.3) execjs (2.0.2) ffi (1.9.3) - font-awesome-rails (4.0.3.2) + font-awesome-rails (4.1.0.0) railties (>= 3.2, < 5.0) formatador (0.2.4) fssm (0.2.10) @@ -172,9 +169,8 @@ GEM kaminari (0.15.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) - listen (2.7.4) + listen (2.7.5) celluloid (>= 0.15.2) - celluloid-io (>= 0.15.0) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) lumberjack (1.0.5) @@ -183,11 +179,10 @@ GEM treetop (~> 1.4.8) method_source (0.8.2) mime-types (1.25.1) - minitest (5.3.3) + minitest (5.3.4) modernizr-rails (2.7.1) multi_json (1.10.0) - mysql2 (0.3.15) - nio4r (1.0.0) + mysql2 (0.3.16) openlayers-rails (0.0.4) railties (>= 3.1) polyglot (0.3.4) @@ -218,13 +213,13 @@ GEM activesupport (= 4.1.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.3.1) + rake (10.3.2) rb-fsevent (0.9.4) rb-inotify (0.9.4) ffi (>= 0.5.0) rdoc (4.1.1) json (~> 1.4) - redcarpet (3.1.1) + redcarpet (3.1.2) responders (1.0.0) railties (>= 3.2, < 5) sass (3.2.19) @@ -237,7 +232,7 @@ GEM json (~> 1.8) rdoc (~> 4.0, < 5.0) slop (3.5.0) - spring (1.1.2) + spring (1.1.3) sprockets (2.11.0) hike (~> 1.2) multi_json (~> 1.0)