From 19193f1680b423c933a21fd374104f7eab81f04a Mon Sep 17 00:00:00 2001 From: echarp Date: Fri, 10 Jan 2014 23:36:18 +0100 Subject: [PATCH] bundle update --- Gemfile.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 83e71fd4..f3db329d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,7 +7,7 @@ GIT GIT remote: git://github.com/gregbell/active_admin.git - revision: 0f333d3a0236de1b13e1cd8cda35f1406c0ceba8 + revision: 7465eb37877897849a2466a05afd2af4ee7a9338 specs: activeadmin (1.0.0.pre) arbre (~> 1.0) @@ -112,7 +112,7 @@ GEM guard-minitest (2.1.3) guard (~> 2.0) minitest (>= 3.0) - haml (4.0.4) + haml (4.0.5) tilt haml-rails (0.5.3) actionpack (>= 4.0.1) @@ -154,7 +154,7 @@ GEM method_source (0.8.2) mime-types (1.25.1) minitest (4.7.5) - multi_json (1.8.2) + multi_json (1.8.4) mysql2 (0.3.14) orm_adapter (0.5.0) polyamorous (0.6.4) @@ -193,7 +193,7 @@ GEM rb-fsevent (0.9.4) rb-inotify (0.9.3) ffi (>= 0.5.0) - rdoc (3.12.2) + rdoc (4.1.1) json (~> 1.4) redcarpet (3.0.0) responders (1.0.0) @@ -203,9 +203,9 @@ GEM railties (>= 4.0.0, < 5.0) sass (>= 3.1.10) sprockets-rails (~> 2.0.0) - sdoc (0.3.20) - json (>= 1.1.3) - rdoc (~> 3.10) + sdoc (0.4.0) + json (~> 1.8) + rdoc (~> 4.0, < 5.0) slop (3.4.7) sprockets (2.10.1) hike (~> 1.2)