diff --git a/Gemfile.lock b/Gemfile.lock index 1baa38da..ff7f96fd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,14 +7,14 @@ GIT GIT remote: git://github.com/gregbell/active_admin.git - revision: d7dfc134574e08a5509291ee9d5df386540533ce + revision: 0e0b3694bace985f355135f9628ea7918c3695d2 specs: activeadmin (1.0.0.pre) arbre (~> 1.0) bourbon coffee-rails formtastic (~> 2.3.0.rc3) - inherited_resources (~> 1.3) + inherited_resources (~> 1.4.1) jquery-rails jquery-ui-rails kaminari (~> 0.15) @@ -32,27 +32,27 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (4.1.2.rc3) - actionpack (= 4.1.2.rc3) - actionview (= 4.1.2.rc3) + actionmailer (4.1.2) + actionpack (= 4.1.2) + actionview (= 4.1.2) mail (~> 2.5.4) - actionpack (4.1.2.rc3) - actionview (= 4.1.2.rc3) - activesupport (= 4.1.2.rc3) + actionpack (4.1.2) + actionview (= 4.1.2) + activesupport (= 4.1.2) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionview (4.1.2.rc3) - activesupport (= 4.1.2.rc3) + actionview (4.1.2) + activesupport (= 4.1.2) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.2.rc3) - activesupport (= 4.1.2.rc3) + activemodel (4.1.2) + activesupport (= 4.1.2) builder (~> 3.1) - activerecord (4.1.2.rc3) - activemodel (= 4.1.2.rc3) - activesupport (= 4.1.2.rc3) + activerecord (4.1.2) + activemodel (= 4.1.2) + activesupport (= 4.1.2) arel (~> 5.0.0) - activesupport (4.1.2.rc3) + activesupport (4.1.2) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -132,7 +132,7 @@ GEM guard-bundler (2.0.0) bundler (~> 1.0) guard (~> 2.2) - guard-livereload (2.2.0) + guard-livereload (2.3.0) em-websocket (~> 0.5) guard (~> 2.0) multi_json (~> 1.8) @@ -153,9 +153,9 @@ GEM hike (1.2.3) http_parser.rb (0.6.0) i18n (0.6.9) - inherited_resources (1.5.0) + inherited_resources (1.4.1) has_scope (~> 0.6.0.rc) - responders (~> 1.0) + responders (~> 1.0.0.rc) jbuilder (2.1.1) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) @@ -176,7 +176,7 @@ GEM celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - lumberjack (1.0.7) + lumberjack (1.0.9) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -201,22 +201,22 @@ GEM rack (1.5.2) rack-test (0.6.2) rack (>= 1.0) - rails (4.1.2.rc3) - actionmailer (= 4.1.2.rc3) - actionpack (= 4.1.2.rc3) - actionview (= 4.1.2.rc3) - activemodel (= 4.1.2.rc3) - activerecord (= 4.1.2.rc3) - activesupport (= 4.1.2.rc3) + rails (4.1.2) + actionmailer (= 4.1.2) + actionpack (= 4.1.2) + actionview (= 4.1.2) + activemodel (= 4.1.2) + activerecord (= 4.1.2) + activesupport (= 4.1.2) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.2.rc3) + railties (= 4.1.2) sprockets-rails (~> 2.0) rails-i18n (4.0.2) i18n (~> 0.6) rails (>= 4.0) - railties (4.1.2.rc3) - actionpack (= 4.1.2.rc3) - activesupport (= 4.1.2.rc3) + railties (4.1.2) + actionpack (= 4.1.2) + activesupport (= 4.1.2) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.3.2) @@ -233,7 +233,7 @@ GEM json (~> 1.4) redcarpet (3.1.2) ref (1.0.5) - responders (1.1.0) + responders (1.0.0) railties (>= 3.2, < 5) ruby2ruby (2.0.8) ruby_parser (~> 3.1)