X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5fd4fd13c2e4cb577d8d28de8526811941720d76..269888802c999aa8568ba5ae8c7dad99ecfc2aef:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 618af37ac..a693e857c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,38 +2,38 @@ GEM remote: https://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (4.2.7) - actionpack (= 4.2.7) - actionview (= 4.2.7) - activejob (= 4.2.7) + actionmailer (4.2.7.1) + actionpack (= 4.2.7.1) + actionview (= 4.2.7.1) + activejob (= 4.2.7.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.7) - actionview (= 4.2.7) - activesupport (= 4.2.7) + actionpack (4.2.7.1) + actionview (= 4.2.7.1) + activesupport (= 4.2.7.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.7) - activesupport (= 4.2.7) + actionview (4.2.7.1) + activesupport (= 4.2.7.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.7) - activesupport (= 4.2.7) + activejob (4.2.7.1) + activesupport (= 4.2.7.1) globalid (>= 0.3.0) - activemodel (4.2.7) - activesupport (= 4.2.7) + activemodel (4.2.7.1) + activesupport (= 4.2.7.1) builder (~> 3.1) - activerecord (4.2.7) - activemodel (= 4.2.7) - activesupport (= 4.2.7) + activerecord (4.2.7.1) + activemodel (= 4.2.7.1) + activesupport (= 4.2.7.1) arel (~> 6.0) - activesupport (4.2.7) + activesupport (4.2.7.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -42,11 +42,11 @@ GEM addressable (2.4.0) arel (6.0.3) ast (2.3.0) - autoprefixer-rails (6.3.7) + autoprefixer-rails (6.5.1.1) execjs bigdecimal (1.1.0) builder (3.2.2) - capybara (2.7.1) + capybara (2.10.1) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -66,15 +66,15 @@ GEM execjs coffee-script-source (1.10.0) colorize (0.8.1) - composite_primary_keys (8.1.3) + composite_primary_keys (8.1.4) activerecord (~> 4.2.0) concurrent-ruby (1.0.2) - coveralls (0.8.14) + coveralls (0.8.15) json (>= 1.8, < 3) simplecov (~> 0.12.0) term-ansicolor (~> 1.3) thor (~> 0.19.1) - tins (~> 1.6.0) + tins (>= 1.6.0, < 2) crass (1.0.2) dalli (2.7.6) deadlock_retry (1.2.0) @@ -82,28 +82,33 @@ GEM dynamic_form (1.1.4) erubis (2.7.0) execjs (2.7.0) - exifr (1.2.4) + exifr (1.2.5) + factory_girl (4.7.0) + activesupport (>= 3.0.0) + factory_girl_rails (4.7.0) + factory_girl (~> 4.7.0) + railties (>= 3.0.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) - fspath (2.1.1) - globalid (0.3.6) + fspath (3.0.1) + geoip (1.6.2) + globalid (0.3.7) activesupport (>= 4.1.0) - hashie (3.4.4) + hashie (3.4.6) htmlentities (4.3.4) http_accept_language (2.0.5) - httpclient (2.8.0) i18n (0.7.0) - i18n-js (3.0.0.rc13) + i18n-js (3.0.0.rc14) i18n (~> 0.6, >= 0.6.6) - image_optim (0.22.1) + image_optim (0.24.0) exifr (~> 1.2, >= 1.2.2) - fspath (~> 2.1) + fspath (~> 3.0) 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.1) + jquery-rails (4.2.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -117,7 +122,7 @@ GEM jsonify-rails (0.3.2) actionpack jsonify (< 0.4.0) - jwt (1.5.4) + jwt (1.5.6) kgio (2.10.0) konacha (4.0.0) actionpack (>= 4.1, < 5) @@ -130,7 +135,7 @@ GEM libv8 (3.16.14.15) libxml-ruby (2.9.0) logstash-event (1.2.02) - logstasher (1.0.0) + logstasher (1.0.1) activerecord (>= 4.0) activesupport (>= 4.0) logstash-event (~> 1.2.0) @@ -144,14 +149,13 @@ GEM mime-types-data (3.2016.0521) mimemagic (0.3.0) mini_portile2 (2.1.0) - minitest (5.9.0) + minitest (5.9.1) multi_json (1.12.1) multi_xml (0.5.5) multipart-post (2.0.0) - nokogiri (1.6.8) + nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) - nokogumbo (1.4.7) + nokogumbo (1.4.9) nokogiri oauth (0.4.7) oauth-plugin (0.5.1) @@ -168,8 +172,11 @@ GEM omniauth (1.3.1) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) - omniauth-facebook (3.0.0) + omniauth-facebook (4.0.0) omniauth-oauth2 (~> 1.2) + omniauth-github (1.1.2) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.1) omniauth-google-oauth2 (0.4.1) jwt (~> 1.5.2) multi_json (~> 1.3) @@ -181,26 +188,25 @@ GEM omniauth-openid (1.0.1) omniauth (~> 1.0) rack-openid (~> 1.3.1) - omniauth-windowslive (0.0.9.1) + omniauth-windowslive (0.0.11) multi_json (>= 1.0.3) - omniauth-oauth2 (~> 1.0) + omniauth-oauth2 (~> 1.4) paperclip (4.3.7) activemodel (>= 3.2.0) activesupport (>= 3.2.0) cocaine (~> 0.5.5) mime-types mimemagic (= 0.3.0) - parser (2.3.1.2) + parser (2.3.1.4) ast (~> 2.2) - pg (0.18.4) - pkg-config (1.1.7) - poltergeist (1.10.0) + pg (0.19.0) + poltergeist (1.11.0) capybara (~> 2.1) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) powerpack (0.1.1) - progress (3.1.1) - psych (2.1.0) + progress (3.2.2) + psych (2.1.1) r2 (0.2.6) rack (1.6.4) rack-cors (0.4.0) @@ -210,16 +216,16 @@ GEM rack-test (0.6.3) rack (>= 1.0) rack-uri_sanitizer (0.0.2) - rails (4.2.7) - actionmailer (= 4.2.7) - actionpack (= 4.2.7) - actionview (= 4.2.7) - activejob (= 4.2.7) - activemodel (= 4.2.7) - activerecord (= 4.2.7) - activesupport (= 4.2.7) + rails (4.2.7.1) + actionmailer (= 4.2.7.1) + actionpack (= 4.2.7.1) + actionview (= 4.2.7.1) + activejob (= 4.2.7.1) + activemodel (= 4.2.7.1) + activerecord (= 4.2.7.1) + activesupport (= 4.2.7.1) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.7) + railties (= 4.2.7.1) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -232,18 +238,18 @@ GEM rails-i18n (4.0.9) i18n (~> 0.7) railties (~> 4.0) - railties (4.2.7) - actionpack (= 4.2.7) - activesupport (= 4.2.7) + railties (4.2.7.1) + actionpack (= 4.2.7.1) + activesupport (= 4.2.7.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.1.0) - rake (11.2.2) + rake (11.3.0) redcarpet (3.3.4) ref (2.0.0) request_store (1.3.1) - rinku (2.0.0) - rubocop (0.41.2) + rinku (2.0.2) + rubocop (0.45.0) parser (>= 2.3.1.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) @@ -251,12 +257,12 @@ GEM unicode-display_width (~> 1.0, >= 1.0.1) ruby-openid (2.7.0) ruby-progressbar (1.8.1) - sanitize (4.0.1) + sanitize (4.4.0) crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (~> 1.4.1) sass (3.4.22) - sass-rails (5.0.5) + sass-rails (5.0.6) railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) @@ -267,15 +273,14 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) - soap4r-ruby1.9 (2.0.5) - sprockets (3.6.3) + sprockets (3.7.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.1.1) + sprockets-rails (3.2.0) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - term-ansicolor (1.3.2) + term-ansicolor (1.4.0) tins (~> 1.0) therubyracer (0.12.2) libv8 (~> 3.16.14.0) @@ -284,12 +289,12 @@ GEM thread_safe (0.3.5) tilt (2.0.5) timecop (0.8.1) - tins (1.6.0) + tins (1.12.0) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (3.0.0) + uglifier (3.0.3) execjs (>= 0.3.0, < 3) - unicode-display_width (1.1.0) + unicode-display_width (1.1.1) validates_email_format_of (1.6.3) i18n vendorer (0.1.16) @@ -313,10 +318,11 @@ DEPENDENCIES dalli deadlock_retry (>= 1.2.0) dynamic_form + factory_girl_rails faraday + geoip htmlentities http_accept_language (~> 2.0.0) - httpclient i18n-js (>= 3.0.0.rc10) image_optim (>= 0.22.0) jquery-rails @@ -331,6 +337,7 @@ DEPENDENCIES oauth-plugin (>= 0.5.1) omniauth omniauth-facebook + omniauth-github omniauth-google-oauth2 (>= 0.2.7) omniauth-openid omniauth-windowslive @@ -341,14 +348,13 @@ DEPENDENCIES r2 rack-cors rack-uri_sanitizer - rails (= 4.2.7) + rails (= 4.2.7.1) rails-i18n (~> 4.0.0) redcarpet rinku (>= 1.2.2) rubocop sanitize sass-rails (~> 5.0) - soap4r-ruby1.9 timecop uglifier (>= 1.3.0) validates_email_format_of (>= 1.5.1)