X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2ef6a960d13bbcbd8be6d7b73ed41a29ac67ed52..3238bf567c5c8a0e807343588b8f38f86d65c1cd:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index af46debe0..296131dc1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,38 +2,38 @@ GEM remote: https://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (4.2.5) - actionpack (= 4.2.5) - actionview (= 4.2.5) - activejob (= 4.2.5) + actionmailer (4.2.5.1) + actionpack (= 4.2.5.1) + actionview (= 4.2.5.1) + activejob (= 4.2.5.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.5) - actionview (= 4.2.5) - activesupport (= 4.2.5) + actionpack (4.2.5.1) + actionview (= 4.2.5.1) + activesupport (= 4.2.5.1) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) actionpack-page_caching (1.0.2) actionpack (>= 4.0.0, < 5) - actionview (4.2.5) - activesupport (= 4.2.5) + actionview (4.2.5.1) + activesupport (= 4.2.5.1) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.5) - activesupport (= 4.2.5) + activejob (4.2.5.1) + activesupport (= 4.2.5.1) globalid (>= 0.3.0) - activemodel (4.2.5) - activesupport (= 4.2.5) + activemodel (4.2.5.1) + activesupport (= 4.2.5.1) builder (~> 3.1) - activerecord (4.2.5) - activemodel (= 4.2.5) - activesupport (= 4.2.5) + activerecord (4.2.5.1) + activemodel (= 4.2.5.1) + activesupport (= 4.2.5.1) arel (~> 6.0) - activesupport (4.2.5) + activesupport (4.2.5.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -42,12 +42,12 @@ GEM addressable (2.4.0) arel (6.0.3) ast (2.2.0) - autoprefixer-rails (6.3.1) + autoprefixer-rails (6.3.2) execjs json bigdecimal (1.1.0) builder (3.2.2) - capybara (2.6.0) + capybara (2.6.2) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -81,7 +81,7 @@ GEM dalli (2.7.5) deadlock_retry (1.2.0) docile (1.1.5) - domain_name (0.5.25) + domain_name (0.5.20160128) unf (>= 0.0.5, < 1.0.0) dynamic_form (1.1.4) erubis (2.7.0) @@ -123,14 +123,15 @@ GEM jsonify-rails (0.3.2) actionpack jsonify (< 0.4.0) - jwt (1.5.2) + jwt (1.5.1) kgio (2.10.0) - konacha (3.7.0) - actionpack (>= 3.1, < 5) + konacha (4.0.0) + actionpack (>= 4.1, < 5) capybara colorize - railties (>= 3.1, < 5) + railties (>= 4.1, < 5) sprockets (>= 2, < 4) + sprockets-rails (>= 2, < 4) tilt libv8 (3.16.14.13) libxml-ruby (2.8.0) @@ -147,12 +148,12 @@ GEM mime-types (2.99) mimemagic (0.3.0) mini_portile2 (2.0.0) - minitest (5.8.3) + minitest (5.8.4) multi_json (1.11.2) multi_xml (0.5.5) multipart-post (2.0.0) netrc (0.11.0) - nokogiri (1.6.7.1) + nokogiri (1.6.7.2) mini_portile2 (~> 2.0.0.rc2) nokogumbo (1.4.7) nokogiri @@ -162,19 +163,18 @@ GEM oauth (~> 0.4.4) oauth2 (>= 0.5.0) rack - oauth2 (1.0.0) + oauth2 (1.1.0) faraday (>= 0.8, < 0.10) - jwt (~> 1.0) + jwt (~> 1.0, < 1.5.2) multi_json (~> 1.3) multi_xml (~> 0.5) - rack (~> 1.2) + rack (>= 1.2, < 3) omniauth (1.3.1) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) omniauth-facebook (3.0.0) omniauth-oauth2 (~> 1.2) - omniauth-google-oauth2 (0.3.0) - addressable (~> 2.3) + omniauth-google-oauth2 (0.3.1) jwt (~> 1.0) multi_json (~> 1.3) omniauth (>= 1.1.1) @@ -188,16 +188,16 @@ GEM omniauth-windowslive (0.0.9.1) multi_json (>= 1.0.3) omniauth-oauth2 (~> 1.0) - paperclip (4.3.2) + paperclip (4.3.5) activemodel (>= 3.2.0) activesupport (>= 3.2.0) cocaine (~> 0.5.5) mime-types mimemagic (= 0.3.0) - parser (2.3.0.1) + parser (2.3.0.4) ast (~> 2.2) pg (0.18.4) - poltergeist (1.8.1) + poltergeist (1.9.0) capybara (~> 2.1) cliver (~> 0.3.1) multi_json (~> 1.0) @@ -214,16 +214,16 @@ GEM rack-test (0.6.3) rack (>= 1.0) rack-uri_sanitizer (0.0.2) - rails (4.2.5) - actionmailer (= 4.2.5) - actionpack (= 4.2.5) - actionview (= 4.2.5) - activejob (= 4.2.5) - activemodel (= 4.2.5) - activerecord (= 4.2.5) - activesupport (= 4.2.5) + rails (4.2.5.1) + actionmailer (= 4.2.5.1) + actionpack (= 4.2.5.1) + actionview (= 4.2.5.1) + activejob (= 4.2.5.1) + activemodel (= 4.2.5.1) + activerecord (= 4.2.5.1) + activesupport (= 4.2.5.1) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.5) + railties (= 4.2.5.1) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -231,17 +231,17 @@ GEM 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) rails-i18n (4.0.8) i18n (~> 0.7) railties (~> 4.0) - railties (4.2.5) - actionpack (= 4.2.5) - activesupport (= 4.2.5) + railties (4.2.5.1) + actionpack (= 4.2.5.1) + activesupport (= 4.2.5.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.0.0) + rainbow (2.1.0) rake (10.5.0) redcarpet (3.3.4) ref (2.0.0) @@ -251,11 +251,12 @@ GEM mime-types (>= 1.16, < 3.0) netrc (~> 0.7) rinku (1.7.3) - rubocop (0.36.0) - parser (>= 2.3.0.0, < 3.0) + rubocop (0.37.1) + parser (>= 2.3.0.4, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.7) + unicode-display_width (~> 0.3) ruby-openid (2.7.0) ruby-progressbar (1.7.5) sanitize (4.0.1) @@ -269,7 +270,7 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - simplecov (0.11.1) + simplecov (0.11.2) docile (~> 1.1.0) json (~> 1.8) simplecov-html (~> 0.10.0) @@ -278,10 +279,10 @@ GEM sprockets (3.5.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (2.3.3) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) + sprockets-rails (3.0.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) term-ansicolor (1.3.2) tins (~> 1.0) therubyracer (0.12.2) @@ -299,7 +300,8 @@ GEM json (>= 1.8.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.1) + unf_ext (0.0.7.2) + unicode-display_width (0.3.1) validates_email_format_of (1.6.3) i18n vendorer (0.1.16) @@ -351,7 +353,7 @@ DEPENDENCIES r2 rack-cors rack-uri_sanitizer - rails (= 4.2.5) + rails (= 4.2.5.1) rails-i18n (~> 4.0.0) redcarpet rinku (>= 1.2.2)