From 959f5a72d7993aeb046d065059095e32cef5dfe6 Mon Sep 17 00:00:00 2001 From: echarp Date: Fri, 18 Apr 2014 19:12:33 +0200 Subject: [PATCH] =?UTF-8?q?Passage=20=C3=A0=20rails=204.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile.lock | 98 +++++++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 50 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 26fbf1fd..9e62dcd7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,8 +1,8 @@ GIT remote: git://github.com/activerecord-hackery/polyamorous.git - revision: 3d45f4c9219b5e6626096d38aa04f401b7ce7808 + revision: c1a6a04972709a10296cb0705de2433791b3dbf8 specs: - polyamorous (0.6.4) + polyamorous (1.0.0) activerecord (>= 3.0) GIT @@ -25,7 +25,7 @@ GIT GIT remote: git://github.com/gregbell/active_admin.git - revision: ee996b09edb9c4f993b9a678dd9cd319c99bb20b + revision: a05b0dccabc2b9d08b1e957ea1443a79033e8ca8 specs: activeadmin (1.0.0.pre) arbre (~> 1.0) @@ -37,16 +37,16 @@ GIT jquery-rails jquery-ui-rails kaminari (~> 0.15) - rails (>= 3.2, < 4.1) + rails (>= 3.2, <= 4.1) ransack (~> 1.0) sass-rails GIT remote: git://github.com/justinfrench/formtastic.git - revision: 9904fc4336f63a5375573a7002647680dcae773e + revision: c79e46560d1516c6c3c0ef85fb29bed8e36068ac specs: - formtastic (2.3.0.rc2) - actionpack (>= 3.0) + formtastic (2.3.0.rc3) + actionpack (>= 3.2.13) GIT remote: git://github.com/svenfuchs/i18n-active_record.git @@ -58,27 +58,27 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (4.1.0.rc2) - actionpack (= 4.1.0.rc2) - actionview (= 4.1.0.rc2) + actionmailer (4.1.0) + actionpack (= 4.1.0) + actionview (= 4.1.0) mail (~> 2.5.4) - actionpack (4.1.0.rc2) - actionview (= 4.1.0.rc2) - activesupport (= 4.1.0.rc2) + actionpack (4.1.0) + actionview (= 4.1.0) + activesupport (= 4.1.0) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionview (4.1.0.rc2) - activesupport (= 4.1.0.rc2) + actionview (4.1.0) + activesupport (= 4.1.0) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.0.rc2) - activesupport (= 4.1.0.rc2) + activemodel (4.1.0) + activesupport (= 4.1.0) builder (~> 3.1) - activerecord (4.1.0.rc2) - activemodel (= 4.1.0.rc2) - activesupport (= 4.1.0.rc2) + activerecord (4.1.0) + activemodel (= 4.1.0) + activesupport (= 4.1.0) arel (~> 5.0.0) - activesupport (4.1.0.rc2) + activesupport (4.1.0) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -86,8 +86,7 @@ GEM tzinfo (~> 1.1) arbre (1.0.1) activesupport (>= 3.0.0) - arel (5.0.0) - atomic (1.1.16) + arel (5.0.1.20140414130214) bcrypt (3.1.7) bourbon (3.1.8) sass (>= 3.2.0) @@ -107,10 +106,10 @@ GEM coffee-script-source execjs coffee-script-source (1.7.0) - compass (0.12.4) + compass (0.12.5) chunky_png (~> 1.2) fssm (>= 0.2.7) - sass (~> 3.2.17) + sass (~> 3.2.19) compass-rails (1.1.7) compass (>= 0.12.2) sprockets (<= 2.11.0) @@ -165,16 +164,16 @@ GEM inherited_resources (1.4.1) has_scope (~> 0.6.0.rc) responders (~> 1.0.0.rc) - jbuilder (2.0.5) - activesupport (>= 3.0.0) - multi_json (>= 1.2.0) + jbuilder (2.0.6) + activesupport (>= 3.0.0, < 5) + multi_json (~> 1.2) jquery-rails (3.1.0) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) jquery-turbolinks (2.0.2) railties (>= 3.1.0) turbolinks - jquery-ui-rails (4.2.0) + jquery-ui-rails (4.2.1) railties (>= 3.2.16) json (1.8.1) kaminari (0.15.1) @@ -191,7 +190,7 @@ GEM treetop (~> 1.4.8) method_source (0.8.2) mime-types (1.25.1) - minitest (5.3.2) + minitest (5.3.3) modernizr-rails (2.7.1) multi_json (1.9.2) mysql2 (0.3.15) @@ -207,25 +206,25 @@ GEM rack (1.5.2) rack-test (0.6.2) rack (>= 1.0) - rails (4.1.0.rc2) - actionmailer (= 4.1.0.rc2) - actionpack (= 4.1.0.rc2) - actionview (= 4.1.0.rc2) - activemodel (= 4.1.0.rc2) - activerecord (= 4.1.0.rc2) - activesupport (= 4.1.0.rc2) + rails (4.1.0) + actionmailer (= 4.1.0) + actionpack (= 4.1.0) + actionview (= 4.1.0) + activemodel (= 4.1.0) + activerecord (= 4.1.0) + activesupport (= 4.1.0) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.0.rc2) - sprockets-rails (~> 2.0.0) + railties (= 4.1.0) + sprockets-rails (~> 2.0) rails-i18n (4.0.2) i18n (~> 0.6) rails (>= 4.0) - railties (4.1.0.rc2) - actionpack (= 4.1.0.rc2) - activesupport (= 4.1.0.rc2) + railties (4.1.0) + actionpack (= 4.1.0) + activesupport (= 4.1.0) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.2.2) + rake (10.3.1) rb-fsevent (0.9.4) rb-inotify (0.9.3) ffi (>= 0.5.0) @@ -234,12 +233,12 @@ GEM redcarpet (3.1.1) responders (1.0.0) railties (>= 3.2, < 5) - sass (3.2.18) - sass-rails (4.0.2) + sass (3.2.19) + sass-rails (4.0.3) railties (>= 4.0.0, < 5.0) sass (~> 3.2.0) sprockets (~> 2.8, <= 2.11.0) - sprockets-rails (~> 2.0.0) + sprockets-rails (~> 2.0) sdoc (0.4.0) json (~> 1.8) rdoc (~> 4.0, < 5.0) @@ -250,19 +249,18 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.0.1) + sprockets-rails (2.1.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) thor (0.19.1) - thread_safe (0.3.1) - atomic (>= 1.1.7, < 2) + thread_safe (0.3.3) tilt (1.4.1) timers (1.1.0) treetop (1.4.15) polyglot polyglot (>= 0.3.1) - turbolinks (2.2.1) + turbolinks (2.2.2) coffee-rails tzinfo (1.1.0) thread_safe (~> 0.1)