Merge remote-tracking branch 'origin/master' into routing

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 676595a47463830f8b37f1c228e09675cbaf7846..d477fcfca672953b3b2b25613618b493fc9cc057 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,38 +2,45 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)

-    actionmailer (4.0.2)
-      actionpack (= 4.0.2)
+    actionmailer (4.0.3)
+      actionpack (= 4.0.3)

       mail (~> 2.5.4)
       mail (~> 2.5.4)

-    actionpack (4.0.2)
-      activesupport (= 4.0.2)
+    actionpack (4.0.3)
+      activesupport (= 4.0.3)

       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
     actionpack-page_caching (1.0.2)
       actionpack (>= 4.0.0, < 5)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
     actionpack-page_caching (1.0.2)
       actionpack (>= 4.0.0, < 5)

-    activemodel (4.0.2)
-      activesupport (= 4.0.2)
+    activemodel (4.0.3)
+      activesupport (= 4.0.3)

       builder (~> 3.1.0)
       builder (~> 3.1.0)

-    activerecord (4.0.2)
-      activemodel (= 4.0.2)
+    activerecord (4.0.3)
+      activemodel (= 4.0.3)

       activerecord-deprecated_finders (~> 1.0.2)
       activerecord-deprecated_finders (~> 1.0.2)

-      activesupport (= 4.0.2)
+      activesupport (= 4.0.3)

       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)

-    activesupport (4.0.2)
+    activesupport (4.0.3)

       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)

-    arel (4.0.1)
-    atomic (1.1.14)
+    arel (4.0.2)
+    atomic (1.1.15)

     bigdecimal (1.1.0)
     builder (3.1.4)
     bigdecimal (1.1.0)
     builder (3.1.4)

+    capybara (2.2.1)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)

     climate_control (0.0.3)
       activesupport (>= 3.0)
     climate_control (0.0.3)
       activesupport (>= 3.0)

+    cliver (0.3.2)

     cocaine (0.5.3)
       climate_control (>= 0.0.3, < 1.0)
     coffee-rails (4.0.1)
     cocaine (0.5.3)
       climate_control (>= 0.0.3, < 1.0)
     coffee-rails (4.0.1)


@@ -42,7 +49,8 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script (2.2.0)
       coffee-script-source
       execjs

-    coffee-script-source (1.6.3)
+    coffee-script-source (1.7.0)
+    colorize (0.6.0)

     composite_primary_keys (6.0.1)
       activerecord (>= 4.0.0)
     dalli (2.7.0)
     composite_primary_keys (6.0.1)
       activerecord (>= 4.0.0)
     dalli (2.7.0)


@@ -54,11 +62,11 @@ GEM
       multipart-post (>= 1.2, < 3)
     hike (1.2.3)
     htmlentities (4.3.1)
       multipart-post (>= 1.2, < 3)
     hike (1.2.3)
     htmlentities (4.3.1)

-    http_accept_language (2.0.0)
+    http_accept_language (2.0.1)

     httpclient (2.3.4.1)
     i18n (0.6.9)
     iconv (0.1)
     httpclient (2.3.4.1)
     i18n (0.6.9)
     iconv (0.1)

-    jquery-rails (3.0.4)
+    jquery-rails (3.1.0)

       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)


@@ -67,9 +75,15 @@ GEM
     jsonify-rails (0.3.2)
       actionpack
       jsonify (< 0.4.0)
     jsonify-rails (0.3.2)
       actionpack
       jsonify (< 0.4.0)

-    jwt (0.1.10)
+    jwt (0.1.11)

       multi_json (>= 1.5)
       multi_json (>= 1.5)

-    kgio (2.8.1)
+    kgio (2.9.2)
+    konacha (3.1.0)
+      actionpack (>= 3.1, < 5)
+      capybara
+      colorize
+      railties (>= 3.1, < 5)
+      sprockets

     libxml-ruby (2.7.0)
     mail (2.5.4)
       mime-types (~> 1.16)
     libxml-ruby (2.7.0)
     mail (2.5.4)
       mime-types (~> 1.16)


@@ -98,51 +112,56 @@ GEM
       rack-openid (~> 1.3)
     openstreetmap-i18n-js (3.0.0.rc5.3)
       i18n
       rack-openid (~> 1.3)
     openstreetmap-i18n-js (3.0.0.rc5.3)
       i18n

-    paperclip (3.5.2)
+    paperclip (4.1.1)

       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
       mime-types
     pg (0.17.1)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
       mime-types
     pg (0.17.1)

-    polyglot (0.3.3)
-    psych (2.0.2)
+    poltergeist (1.5.0)
+      capybara (~> 2.1)
+      cliver (~> 0.3.1)
+      multi_json (~> 1.0)
+      websocket-driver (>= 0.2.0)
+    polyglot (0.3.4)
+    psych (2.0.4)

     r2 (0.2.2)
     rack (1.5.2)
     rack-cors (0.2.9)
     r2 (0.2.2)
     rack (1.5.2)
     rack-cors (0.2.9)

-    rack-openid (1.4.1)
+    rack-openid (1.4.2)

       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-test (0.6.2)
       rack (>= 1.0)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-test (0.6.2)
       rack (>= 1.0)

-    rails (4.0.2)
-      actionmailer (= 4.0.2)
-      actionpack (= 4.0.2)
-      activerecord (= 4.0.2)
-      activesupport (= 4.0.2)
+    rails (4.0.3)
+      actionmailer (= 4.0.3)
+      actionpack (= 4.0.3)
+      activerecord (= 4.0.3)
+      activesupport (= 4.0.3)

       bundler (>= 1.3.0, < 2.0)
       bundler (>= 1.3.0, < 2.0)

-      railties (= 4.0.2)
+      railties (= 4.0.3)

       sprockets-rails (~> 2.0.0)
     rails-i18n (4.0.1)
       i18n (~> 0.6)
       rails (~> 4.0)
       sprockets-rails (~> 2.0.0)
     rails-i18n (4.0.1)
       i18n (~> 0.6)
       rails (~> 4.0)

-    railties (4.0.2)
-      actionpack (= 4.0.2)
-      activesupport (= 4.0.2)
+    railties (4.0.3)
+      actionpack (= 4.0.3)
+      activesupport (= 4.0.3)

       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.1.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.1.1)

-    redcarpet (3.0.0)
+    redcarpet (3.1.1)

     rinku (1.7.3)
     rinku (1.7.3)

-    ruby-openid (2.3.0)
+    ruby-openid (2.5.0)

     sanitize (2.1.0)
       nokogiri (>= 1.4.4)
     sanitize (2.1.0)
       nokogiri (>= 1.4.4)

-    sass (3.2.13)
+    sass (3.2.14)

     sass-rails (4.0.1)
       railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
       sprockets-rails (~> 2.0.0)
     soap4r-ruby1.9 (2.0.5)
     sass-rails (4.0.1)
       railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
       sprockets-rails (~> 2.0.0)
     soap4r-ruby1.9 (2.0.5)

-    sprockets (2.10.1)
+    sprockets (2.11.0)

       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)


@@ -152,8 +171,8 @@ GEM
       activesupport (>= 3.0)
       sprockets (~> 2.8)
     thor (0.18.1)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
     thor (0.18.1)

-    thread_safe (0.1.3)
-      atomic
+    thread_safe (0.2.0)
+      atomic (>= 1.1.7, < 2)

     tilt (1.4.1)
     timecop (0.7.1)
     treetop (1.4.15)
     tilt (1.4.1)
     timecop (0.7.1)
     treetop (1.4.15)


@@ -165,6 +184,9 @@ GEM
       json (>= 1.8.0)
     validates_email_format_of (1.5.3)
     vendorer (0.1.14)
       json (>= 1.8.0)
     validates_email_format_of (1.5.3)
     vendorer (0.1.14)

+    websocket-driver (0.3.2)
+    xpath (2.0.0)
+      nokogiri (~> 1.3)

 
 PLATFORMS
   ruby
 
 PLATFORMS
   ruby


@@ -186,17 +208,19 @@ DEPENDENCIES
   json
   jsonify-rails
   kgio
   json
   jsonify-rails
   kgio

+  konacha

   libxml-ruby (>= 2.0.5)
   minitest (~> 4.7.0)
   oauth-plugin (>= 0.5.1)
   open_id_authentication (>= 1.1.0)
   openstreetmap-i18n-js (>= 3.0.0.rc5.3)
   libxml-ruby (>= 2.0.5)
   minitest (~> 4.7.0)
   oauth-plugin (>= 0.5.1)
   open_id_authentication (>= 1.1.0)
   openstreetmap-i18n-js (>= 3.0.0.rc5.3)

-  paperclip (~> 3.0)
+  paperclip (~> 4.0)

   pg
   pg

+  poltergeist

   psych
   r2
   rack-cors
   psych
   r2
   rack-cors

-  rails (= 4.0.2)
+  rails (= 4.0.3)

   rails-i18n (~> 4.0.0)
   redcarpet
   rinku (>= 1.2.2)
   rails-i18n (~> 4.0.0)
   redcarpet
   rinku (>= 1.2.2)