diff --git a/Gemfile.lock b/Gemfile.lock index 85d5aeb9..dd5feaff 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/gregbell/active_admin.git - revision: ac85139e308d26cc5706e0f431ea07553fff45d5 + revision: b8e89c74788199d383963267f4735dccbf292f20 specs: activeadmin (1.0.0.pre) arbre (~> 1.0) @@ -92,7 +92,7 @@ GEM sass (~> 3.2.19) compass-rails (2.0.0) compass (>= 0.12.2) - devise (3.2.4) + devise (3.3.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) @@ -113,7 +113,7 @@ GEM font-awesome-rails (4.1.0.0) railties (>= 3.2, < 5.0) formatador (0.2.5) - formtastic (2.3.0.rc3) + formtastic (2.3.0.rc4) actionpack (>= 3.0) fssm (0.2.10) guard (2.6.1) @@ -240,9 +240,8 @@ GEM ref (1.0.5) responders (1.0.0) railties (>= 3.2, < 5) - rubocop (0.24.1) - json (>= 1.7.7, < 2) - parser (>= 2.2.0.pre.3, < 3.0) + rubocop (0.25.0) + parser (>= 2.2.0.pre.4, < 3.0) powerpack (~> 0.0.6) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) @@ -258,10 +257,10 @@ GEM sass (~> 3.2.0) sprockets (~> 2.8, <= 2.11.0) sprockets-rails (~> 2.0) - sdoc (0.4.0) - json (~> 1.8) - rdoc (~> 4.0, < 5.0) - sexp_processor (4.4.3) + sdoc (0.4.1) + json (~> 1.7, >= 1.7.7) + rdoc (~> 4.0) + sexp_processor (4.4.4) simple_calendar (1.1.5) rails (>= 3.0) slim (2.0.3)