Update to iD v1.9.1

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index f94bbb2c294fedb5360190d63273369fbd729362..7fb23a9c5c1cbfed2194e0423071983c3201f731 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,53 +2,52 @@ GEM
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)

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

       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.1)
-      actionview (= 4.2.1)
-      activesupport (= 4.2.1)
+    actionpack (4.2.5.2)
+      actionview (= 4.2.5.2)
+      activesupport (= 4.2.5.2)

       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)

-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)

     actionpack-page_caching (1.0.2)
       actionpack (>= 4.0.0, < 5)
     actionpack-page_caching (1.0.2)
       actionpack (>= 4.0.0, < 5)

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

       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       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.1)
-      activesupport (= 4.2.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.5.2)
+      activesupport (= 4.2.5.2)

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

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

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

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

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

-    activesupport (4.2.1)
+    activesupport (4.2.5.2)

       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)

-    arel (6.0.0)
-    ast (2.0.0)
-    astrolabe (1.3.0)
-      parser (>= 2.2.0.pre.3, < 3.0)
-    autoprefixer-rails (5.1.7.1)
+    addressable (2.4.0)
+    arel (6.0.3)
+    ast (2.2.0)
+    autoprefixer-rails (6.3.3.1)

       execjs
       execjs

-      json

     bigdecimal (1.1.0)
     builder (3.2.2)
     bigdecimal (1.1.0)
     builder (3.2.2)

-    capybara (2.4.4)
+    capybara (2.6.2)
+      addressable

       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)


@@ -57,79 +56,99 @@ 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.7)
+    cocaine (0.5.8)

       climate_control (>= 0.0.3, < 1.0)
       climate_control (>= 0.0.3, < 1.0)

-    coffee-rails (4.1.0)
+    coffee-rails (4.1.1)

       coffee-script (>= 2.2.0)
       coffee-script (>= 2.2.0)

-      railties (>= 4.0.0, < 5.0)
-    coffee-script (2.3.0)
+      railties (>= 4.0.0, < 5.1.x)
+    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.1.0)
+    coffee-script-source (1.10.0)
+    colorize (0.7.7)
+    composite_primary_keys (8.1.2)

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

-    coveralls (0.7.11)
-      multi_json (~> 1.10)
-      rest-client (>= 1.6.8, < 2)
-      simplecov (~> 0.9.1)
+    concurrent-ruby (1.0.1)
+    coveralls (0.8.12)
+      json (~> 1.8)
+      simplecov (~> 0.11.0)

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

-    crass (1.0.1)
-    dalli (2.7.4)
+      tins (~> 1.6.0)
+    crass (1.0.2)
+    dalli (2.7.6)

     deadlock_retry (1.2.0)
     docile (1.1.5)
     dynamic_form (1.1.4)
     erubis (2.7.0)
     deadlock_retry (1.2.0)
     docile (1.1.5)
     dynamic_form (1.1.4)
     erubis (2.7.0)

-    execjs (2.4.0)
-    faraday (0.9.1)
+    execjs (2.6.0)
+    exifr (1.2.4)
+    faraday (0.9.2)

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

-    globalid (0.3.3)
+    fspath (2.1.1)
+    globalid (0.3.6)

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

-    hashie (3.4.0)
-    hike (1.2.3)
-    htmlentities (4.3.3)
+    hashie (3.4.3)
+    htmlentities (4.3.4)

     http_accept_language (2.0.5)
     http_accept_language (2.0.5)

-    httpclient (2.6.0.1)
+    httpclient (2.7.1)

     i18n (0.7.0)
     i18n (0.7.0)

-    jquery-rails (4.0.3)
+    i18n-js (3.0.0.rc12)
+      i18n (~> 0.6, >= 0.6.6)
+    image_optim (0.22.1)
+      exifr (~> 1.2, >= 1.2.2)
+      fspath (~> 2.1)
+      image_size (~> 1.3)
+      in_threads (~> 1.3)
+      progress (~> 3.0, >= 3.0.1)
+    image_size (1.4.2)
+    in_threads (1.3.1)
+    jquery-rails (4.1.0)

       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)

-    jshint (1.3.1)
+    jshint (1.4.0)

       execjs (>= 1.4.0)
       multi_json (~> 1.0)
       therubyracer (~> 0.12.1)
       execjs (>= 1.4.0)
       multi_json (~> 1.0)
       therubyracer (~> 0.12.1)

-    json (1.8.2)
+    json (1.8.3)

     jsonify (0.3.1)
       multi_json (~> 1.0)
     jsonify-rails (0.3.2)
       actionpack
       jsonify (< 0.4.0)
     jsonify (0.3.1)
       multi_json (~> 1.0)
     jsonify-rails (0.3.2)
       actionpack
       jsonify (< 0.4.0)

-    jwt (1.4.1)
-    kgio (2.9.3)
-    konacha (3.3.0)
-      actionpack (>= 3.1, < 5)
+    jwt (1.5.1)
+    kgio (2.10.0)
+    konacha (4.0.0)
+      actionpack (>= 4.1, < 5)

       capybara
       colorize
       capybara
       colorize

-      railties (>= 3.1, < 5)
-      sprockets
-    libv8 (3.16.14.7)
+      railties (>= 4.1, < 5)
+      sprockets (>= 2, < 4)
+      sprockets-rails (>= 2, < 4)
+      tilt
+    libv8 (3.16.14.13)

     libxml-ruby (2.8.0)
     libxml-ruby (2.8.0)

-    loofah (2.0.1)
+    logstash-event (1.2.02)
+    logstasher (0.9.0)
+      activerecord (>= 3.0)
+      activesupport (>= 3.0)
+      logstash-event (~> 1.2.0)
+      request_store
+    loofah (2.0.3)

       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)
-    mini_portile (0.6.2)
-    minitest (5.5.1)
-    multi_json (1.11.0)
+    mime-types (2.99.1)
+    mimemagic (0.3.0)
+    mini_portile2 (2.0.0)
+    minitest (5.8.4)
+    multi_json (1.11.2)

     multi_xml (0.5.5)
     multipart-post (2.0.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)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    nokogumbo (1.4.7)

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


@@ -137,131 +156,142 @@ GEM
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack

-    oauth2 (1.0.0)
+    oauth2 (1.1.0)

       faraday (>= 0.8, < 0.10)
       faraday (>= 0.8, < 0.10)

-      jwt (~> 1.0)
+      jwt (~> 1.0, < 1.5.2)

       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)

-      rack (~> 1.2)
-    omniauth (1.2.2)
+      rack (>= 1.2, < 3)
+    omniauth (1.3.1)

       hashie (>= 1.2, < 4)
       hashie (>= 1.2, < 4)

-      rack (~> 1.0)
+      rack (>= 1.0, < 3)
+    omniauth-facebook (3.0.0)
+      omniauth-oauth2 (~> 1.2)
+    omniauth-google-oauth2 (0.3.1)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      omniauth (>= 1.1.1)
+      omniauth-oauth2 (>= 1.3.1)
+    omniauth-oauth2 (1.4.0)
+      oauth2 (~> 1.0)
+      omniauth (~> 1.2)

     omniauth-openid (1.0.1)
       omniauth (~> 1.0)
       rack-openid (~> 1.3.1)
     omniauth-openid (1.0.1)
       omniauth (~> 1.0)
       rack-openid (~> 1.3.1)

-    openstreetmap-i18n-js (3.0.0.rc5.3)
-      i18n
-    paperclip (4.2.1)
-      activemodel (>= 3.0.0)
-      activesupport (>= 3.0.0)
-      cocaine (~> 0.5.3)
+    omniauth-windowslive (0.0.9.1)
+      multi_json (>= 1.0.3)
+      omniauth-oauth2 (~> 1.0)
+    paperclip (4.3.5)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+      cocaine (~> 0.5.5)

       mime-types
       mime-types

-    parser (2.2.0.3)
-      ast (>= 1.1, < 3.0)
-    pg (0.18.1)
-    poltergeist (1.6.0)
+      mimemagic (= 0.3.0)
+    parser (2.3.0.6)
+      ast (~> 2.2)
+    pg (0.18.4)
+    poltergeist (1.9.0)

       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)

-    powerpack (0.1.0)
-    psych (2.0.13)
-    r2 (0.2.5)
-    rack (1.6.0)
-    rack-cors (0.3.1)
+    powerpack (0.1.1)
+    progress (3.1.1)
+    psych (2.0.17)
+    r2 (0.2.6)
+    rack (1.6.4)
+    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.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)
+    rack-uri_sanitizer (0.0.2)
+    rails (4.2.5.2)
+      actionmailer (= 4.2.5.2)
+      actionpack (= 4.2.5.2)
+      actionview (= 4.2.5.2)
+      activejob (= 4.2.5.2)
+      activemodel (= 4.2.5.2)
+      activerecord (= 4.2.5.2)
+      activesupport (= 4.2.5.2)

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

-      railties (= 4.2.1)
+      railties (= 4.2.5.2)

       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.6)
+    rails-dom-testing (1.0.7)

       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.2)
+    rails-html-sanitizer (1.0.3)

       loofah (~> 2.0)
       loofah (~> 2.0)

-    rails-i18n (4.0.4)
-      i18n (~> 0.6)
+    rails-i18n (4.0.8)
+      i18n (~> 0.7)

       railties (~> 4.0)
       railties (~> 4.0)

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

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

-    rainbow (2.0.0)
-    rake (10.4.2)
-    redcarpet (3.2.2)
-    ref (1.0.5)
-    rest-client (1.7.3)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
+    rainbow (2.1.0)
+    rake (10.5.0)
+    redcarpet (3.3.4)
+    ref (2.0.0)
+    request_store (1.3.0)

     rinku (1.7.3)
     rinku (1.7.3)

-    rubocop (0.29.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.0.1, < 3.0)
+    rubocop (0.37.2)
+      parser (>= 2.3.0.4, < 3.0)

       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)

-      ruby-progressbar (~> 1.4)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 0.3)

     ruby-openid (2.7.0)
     ruby-openid (2.7.0)

-    ruby-progressbar (1.7.4)
-    sanitize (3.1.2)
-      crass (~> 1.0.1)
+    ruby-progressbar (1.7.5)
+    sanitize (4.0.1)
+      crass (~> 1.0.2)

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

-      nokogumbo (= 1.2.0)
-    sass (3.4.13)
-    sass-rails (5.0.1)
+      nokogumbo (~> 1.4.1)
+    sass (3.4.21)
+    sass-rails (5.0.4)

       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       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)
+      tilt (>= 1.1, < 3)
+    simplecov (0.11.2)

       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)
     soap4r-ruby1.9 (2.0.5)

-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.4)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    term-ansicolor (1.3.0)
+    sprockets (3.5.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.0.3)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    term-ansicolor (1.3.2)

       tins (~> 1.0)
       tins (~> 1.0)

-    therubyracer (0.12.1)
+    therubyracer (0.12.2)

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

-    tilt (1.4.1)
-    timecop (0.7.3)
-    tins (1.3.5)
+    tilt (2.0.2)
+    timecop (0.8.0)
+    tins (1.6.0)

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

-    uglifier (2.7.1)
+    uglifier (2.7.2)

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

-    validates_email_format_of (1.6.2)
+    unicode-display_width (0.3.1)
+    validates_email_format_of (1.6.3)

       i18n
     vendorer (0.1.16)
       i18n
     vendorer (0.1.16)

-    websocket-driver (0.5.3)
+    websocket-driver (0.6.3)

       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)


@@ -285,6 +315,8 @@ DEPENDENCIES
   htmlentities
   http_accept_language (~> 2.0.0)
   httpclient
   htmlentities
   http_accept_language (~> 2.0.0)
   httpclient

+  i18n-js (>= 3.0.0.rc10)
+  image_optim (>= 0.22.0)

   jquery-rails
   jshint
   json
   jquery-rails
   jshint
   json


@@ -292,18 +324,22 @@ DEPENDENCIES
   kgio
   konacha
   libxml-ruby (>= 2.0.5)
   kgio
   konacha
   libxml-ruby (>= 2.0.5)

+  logstasher

   minitest (~> 5.1)
   oauth-plugin (>= 0.5.1)
   omniauth
   minitest (~> 5.1)
   oauth-plugin (>= 0.5.1)
   omniauth

+  omniauth-facebook
+  omniauth-google-oauth2 (>= 0.2.7)

   omniauth-openid
   omniauth-openid

-  openstreetmap-i18n-js (>= 3.0.0.rc5.3)
+  omniauth-windowslive

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

-  rails (= 4.2.1)
+  rack-uri_sanitizer
+  rails (= 4.2.5.2)

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