Update to iD v1.7.2

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 91d4b662c07b9f6da6fa8d772c0c2759086e6d30..eb37df0660a7bc33f469b2675e04b277208608ff 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,38 +2,38 @@ GEM
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)

-    actionmailer (4.2.0)
-      actionpack (= 4.2.0)
-      actionview (= 4.2.0)
-      activejob (= 4.2.0)
+    actionmailer (4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)

       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)

-    actionpack (4.2.0)
-      actionview (= 4.2.0)
-      activesupport (= 4.2.0)
-      rack (~> 1.6.0)
+    actionpack (4.2.1)
+      actionview (= 4.2.1)
+      activesupport (= 4.2.1)
+      rack (~> 1.6)

       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
     actionpack-page_caching (1.0.2)
       actionpack (>= 4.0.0, < 5)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
     actionpack-page_caching (1.0.2)
       actionpack (>= 4.0.0, < 5)

-    actionview (4.2.0)
-      activesupport (= 4.2.0)
+    actionview (4.2.1)
+      activesupport (= 4.2.1)

       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)

-    activejob (4.2.0)
-      activesupport (= 4.2.0)
+    activejob (4.2.1)
+      activesupport (= 4.2.1)

       globalid (>= 0.3.0)
       globalid (>= 0.3.0)

-    activemodel (4.2.0)
-      activesupport (= 4.2.0)
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)

       builder (~> 3.1)
       builder (~> 3.1)

-    activerecord (4.2.0)
-      activemodel (= 4.2.0)
-      activesupport (= 4.2.0)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)

       arel (~> 6.0)
       arel (~> 6.0)

-    activesupport (4.2.0)
+    activesupport (4.2.1)

       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)


@@ -43,7 +43,7 @@ GEM
     ast (2.0.0)
     astrolabe (1.3.0)
       parser (>= 2.2.0.pre.3, < 3.0)
     ast (2.0.0)
     astrolabe (1.3.0)
       parser (>= 2.2.0.pre.3, < 3.0)

-    autoprefixer-rails (5.1.7)
+    autoprefixer-rails (5.1.11)

       execjs
       json
     bigdecimal (1.1.0)
       execjs
       json
     bigdecimal (1.1.0)


@@ -57,38 +57,42 @@ GEM
     climate_control (0.0.3)
       activesupport (>= 3.0)
     cliver (0.3.2)
     climate_control (0.0.3)
       activesupport (>= 3.0)
     cliver (0.3.2)

-    cocaine (0.5.5)
+    cocaine (0.5.7)

       climate_control (>= 0.0.3, < 1.0)
     coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
       climate_control (>= 0.0.3, < 1.0)
     coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)

-    coffee-script (2.3.0)
+    coffee-script (2.4.1)

       coffee-script-source
       execjs
       coffee-script-source
       execjs

-    coffee-script-source (1.9.1)
-    colorize (0.7.5)
-    composite_primary_keys (8.0.0)
+    coffee-script-source (1.9.1.1)
+    colorize (0.7.7)
+    composite_primary_keys (8.1.0)

       activerecord (~> 4.2.0)
       activerecord (~> 4.2.0)

-    coveralls (0.7.11)
-      multi_json (~> 1.10)
+    coveralls (0.8.1)
+      json (~> 1.8)

       rest-client (>= 1.6.8, < 2)
       rest-client (>= 1.6.8, < 2)

-      simplecov (~> 0.9.1)
+      simplecov (~> 0.10.0)

       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)

-    crass (1.0.1)
-    dalli (2.7.2)
+    crass (1.0.2)
+    dalli (2.7.4)

     deadlock_retry (1.2.0)
     docile (1.1.5)
     deadlock_retry (1.2.0)
     docile (1.1.5)

+    domain_name (0.5.24)
+      unf (>= 0.0.5, < 1.0.0)

     dynamic_form (1.1.4)
     erubis (2.7.0)
     dynamic_form (1.1.4)
     erubis (2.7.0)

-    execjs (2.3.0)
+    execjs (2.5.2)

     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)

-    globalid (0.3.3)
+    globalid (0.3.5)

       activesupport (>= 4.1.0)
       activesupport (>= 4.1.0)

-    hashie (3.4.0)
+    hashie (3.4.1)

     hike (1.2.3)
     htmlentities (4.3.3)
     hike (1.2.3)
     htmlentities (4.3.3)

+    http-cookie (1.0.2)
+      domain_name (~> 0.5)

     http_accept_language (2.0.5)
     httpclient (2.6.0.1)
     i18n (0.7.0)
     http_accept_language (2.0.5)
     httpclient (2.6.0.1)
     i18n (0.7.0)


@@ -106,7 +110,7 @@ GEM
     jsonify-rails (0.3.2)
       actionpack
       jsonify (< 0.4.0)
     jsonify-rails (0.3.2)
       actionpack
       jsonify (< 0.4.0)

-    jwt (1.3.0)
+    jwt (1.4.1)

     kgio (2.9.3)
     konacha (3.3.0)
       actionpack (>= 3.1, < 5)
     kgio (2.9.3)
     konacha (3.3.0)
       actionpack (>= 3.1, < 5)


@@ -120,16 +124,16 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)

-    mime-types (2.4.3)
+    mime-types (2.5)

     mini_portile (0.6.2)
     mini_portile (0.6.2)

-    minitest (5.5.1)
-    multi_json (1.10.1)
+    minitest (5.6.1)
+    multi_json (1.11.0)

     multi_xml (0.5.5)
     multipart-post (2.0.0)
     netrc (0.10.3)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     netrc (0.10.3)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)

-    nokogumbo (1.2.0)
+    nokogumbo (1.4.1)

       nokogiri
     oauth (0.4.7)
     oauth-plugin (0.5.1)
       nokogiri
     oauth (0.4.7)
     oauth-plugin (0.5.1)


@@ -146,17 +150,25 @@ GEM
     omniauth (1.2.2)
       hashie (>= 1.2, < 4)
       rack (~> 1.0)
     omniauth (1.2.2)
       hashie (>= 1.2, < 4)
       rack (~> 1.0)

+    omniauth-oauth2 (1.3.0)
+      oauth2 (~> 1.0)
+      omniauth (~> 1.2)

     omniauth-openid (1.0.1)
       omniauth (~> 1.0)
       rack-openid (~> 1.3.1)
     openstreetmap-i18n-js (3.0.0.rc5.3)
       i18n
     omniauth-openid (1.0.1)
       omniauth (~> 1.0)
       rack-openid (~> 1.3.1)
     openstreetmap-i18n-js (3.0.0.rc5.3)
       i18n

+    openstreetmap-omniauth-google-oauth2 (0.2.6.1)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      omniauth (>= 1.1.1)
+      omniauth-oauth2 (>= 1.1.1)

     paperclip (4.2.1)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
       mime-types
     paperclip (4.2.1)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
       mime-types

-    parser (2.2.0.3)
+    parser (2.2.2.2)

       ast (>= 1.1, < 3.0)
     pg (0.18.1)
     poltergeist (1.6.0)
       ast (>= 1.1, < 3.0)
     pg (0.18.1)
     poltergeist (1.6.0)


@@ -168,71 +180,72 @@ GEM
     psych (2.0.13)
     r2 (0.2.5)
     rack (1.6.0)
     psych (2.0.13)
     r2 (0.2.5)
     rack (1.6.0)

-    rack-cors (0.3.1)
+    rack-cors (0.4.0)

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

-    rails (4.2.0)
-      actionmailer (= 4.2.0)
-      actionpack (= 4.2.0)
-      actionview (= 4.2.0)
-      activejob (= 4.2.0)
-      activemodel (= 4.2.0)
-      activerecord (= 4.2.0)
-      activesupport (= 4.2.0)
+    rails (4.2.1)
+      actionmailer (= 4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      activemodel (= 4.2.1)
+      activerecord (= 4.2.1)
+      activesupport (= 4.2.1)

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

-      railties (= 4.2.0)
+      railties (= 4.2.1)

       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)

-    rails-dom-testing (1.0.5)
+    rails-dom-testing (1.0.6)

       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)

-    rails-html-sanitizer (1.0.1)
+    rails-html-sanitizer (1.0.2)

       loofah (~> 2.0)
     rails-i18n (4.0.4)
       i18n (~> 0.6)
       railties (~> 4.0)
       loofah (~> 2.0)
     rails-i18n (4.0.4)
       i18n (~> 0.6)
       railties (~> 4.0)

-    railties (4.2.0)
-      actionpack (= 4.2.0)
-      activesupport (= 4.2.0)
+    railties (4.2.1)
+      actionpack (= 4.2.1)
+      activesupport (= 4.2.1)

       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.0.0)
     rake (10.4.2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.0.0)
     rake (10.4.2)

-    redcarpet (3.2.2)
+    redcarpet (3.2.3)

     ref (1.0.5)
     ref (1.0.5)

-    rest-client (1.7.3)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)

       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
     rinku (1.7.3)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
     rinku (1.7.3)

-    rubocop (0.29.1)
+    rubocop (0.30.1)

       astrolabe (~> 1.3)
       astrolabe (~> 1.3)

-      parser (>= 2.2.0.1, < 3.0)
+      parser (>= 2.2.2.1, < 3.0)

       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)

-    ruby-openid (2.6.0)
-    ruby-progressbar (1.7.1)
-    sanitize (3.1.2)
-      crass (~> 1.0.1)
+    ruby-openid (2.7.0)
+    ruby-progressbar (1.7.5)
+    sanitize (4.0.0)
+      crass (~> 1.0.2)

       nokogiri (>= 1.4.4)
       nokogiri (>= 1.4.4)

-      nokogumbo (= 1.2.0)
-    sass (3.4.12)
-    sass-rails (5.0.1)
+      nokogumbo (= 1.4.1)
+    sass (3.4.13)
+    sass-rails (5.0.3)

       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (~> 1.1)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (~> 1.1)

-    simplecov (0.9.2)
+    simplecov (0.10.0)

       docile (~> 1.1.0)
       docile (~> 1.1.0)

-      multi_json (~> 1.0)
-      simplecov-html (~> 0.9.0)
-    simplecov-html (0.9.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)

     soap4r-ruby1.9 (2.0.5)
     sprockets (2.12.3)
       hike (~> 1.2)
     soap4r-ruby1.9 (2.0.5)
     sprockets (2.12.3)
       hike (~> 1.2)


@@ -245,23 +258,26 @@ GEM
       sprockets (>= 2.8, < 4.0)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
       sprockets (>= 2.8, < 4.0)
     term-ansicolor (1.3.0)
       tins (~> 1.0)

-    therubyracer (0.12.1)
+    therubyracer (0.12.2)

       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)

-    thread_safe (0.3.4)
+    thread_safe (0.3.5)

     tilt (1.4.1)
     timecop (0.7.3)
     tilt (1.4.1)
     timecop (0.7.3)

-    tins (1.3.4)
+    tins (1.5.1)

     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)

-    uglifier (2.7.0)
+    uglifier (2.7.1)

       execjs (>= 0.3.0)
       json (>= 1.8.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)

+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.1)

     validates_email_format_of (1.6.2)
       i18n
     vendorer (0.1.16)
     validates_email_format_of (1.6.2)
       i18n
     vendorer (0.1.16)

-    websocket-driver (0.5.3)
+    websocket-driver (0.5.4)

       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     xpath (2.0.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     xpath (2.0.0)


@@ -276,11 +292,12 @@ DEPENDENCIES
   autoprefixer-rails
   bigdecimal (~> 1.1.0)
   coffee-rails (~> 4.1.0)
   autoprefixer-rails
   bigdecimal (~> 1.1.0)
   coffee-rails (~> 4.1.0)

-  composite_primary_keys (~> 8.0.0)
+  composite_primary_keys (~> 8.1.0)

   coveralls
   dalli
   deadlock_retry (>= 1.2.0)
   dynamic_form
   coveralls
   dalli
   deadlock_retry (>= 1.2.0)
   dynamic_form

+  faraday

   htmlentities
   http_accept_language (~> 2.0.0)
   httpclient
   htmlentities
   http_accept_language (~> 2.0.0)
   httpclient


@@ -296,13 +313,14 @@ DEPENDENCIES
   omniauth
   omniauth-openid
   openstreetmap-i18n-js (>= 3.0.0.rc5.3)
   omniauth
   omniauth-openid
   openstreetmap-i18n-js (>= 3.0.0.rc5.3)

+  openstreetmap-omniauth-google-oauth2 (>= 0.2.6.1)

   paperclip (~> 4.0)
   pg
   poltergeist
   psych
   r2
   rack-cors
   paperclip (~> 4.0)
   pg
   poltergeist
   psych
   r2
   rack-cors

-  rails (= 4.2.0)
+  rails (= 4.2.1)

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


@@ -310,6 +328,7 @@ DEPENDENCIES
   sanitize
   sass-rails (~> 5.0)
   soap4r-ruby1.9
   sanitize
   sass-rails (~> 5.0)
   soap4r-ruby1.9

+  sprockets (~> 2.12.3)

   timecop
   uglifier (>= 1.3.0)
   validates_email_format_of (>= 1.5.1)
   timecop
   uglifier (>= 1.3.0)
   validates_email_format_of (>= 1.5.1)