X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/391fb933f59075e36e9cea5ea35f5a5efdfc257e..fac3f0ef2435ff1f4393c81cc9cf4113ff6a5bdb:/Gemfile.lock?ds=sidebyside diff --git a/Gemfile.lock b/Gemfile.lock index 5ddadc3e0..2aba9c21b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,45 +4,47 @@ GEM SystemTimer (1.2.3) aasm (5.0.1) concurrent-ruby (~> 1.0) - actioncable (5.2.0) - actionpack (= 5.2.0) + actioncable (5.2.2) + actionpack (= 5.2.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.0) - actionpack (= 5.2.0) - actionview (= 5.2.0) - activejob (= 5.2.0) + actionmailer (5.2.2) + actionpack (= 5.2.2) + actionview (= 5.2.2) + activejob (= 5.2.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.0) - actionview (= 5.2.0) - activesupport (= 5.2.0) + actionpack (5.2.2) + actionview (= 5.2.2) + activesupport (= 5.2.2) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) actionpack-page_caching (1.1.1) actionpack (>= 4.0.0, < 6) - actionview (5.2.0) - activesupport (= 5.2.0) + actionview (5.2.2) + activesupport (= 5.2.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.0) - activesupport (= 5.2.0) + active_record_union (1.3.0) + activerecord (>= 4.0) + activejob (5.2.2) + activesupport (= 5.2.2) globalid (>= 0.3.6) - activemodel (5.2.0) - activesupport (= 5.2.0) - activerecord (5.2.0) - activemodel (= 5.2.0) - activesupport (= 5.2.0) + activemodel (5.2.2) + activesupport (= 5.2.2) + activerecord (5.2.2) + activemodel (= 5.2.2) + activesupport (= 5.2.2) arel (>= 9.0) - activestorage (5.2.0) - actionpack (= 5.2.0) - activerecord (= 5.2.0) + activestorage (5.2.2) + actionpack (= 5.2.2) + activerecord (= 5.2.2) marcel (~> 0.3.1) - activesupport (5.2.0) + activesupport (5.2.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -66,6 +68,7 @@ GEM bootsnap (1.3.2) msgpack (~> 1.0) builder (3.2.3) + cancancan (2.3.0) canonical-rails (0.2.4) rails (>= 4.1, < 5.3) capybara (2.18.0) @@ -85,9 +88,9 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - composite_primary_keys (11.0.3) - activerecord (~> 5.2.0) - concurrent-ruby (1.0.5) + composite_primary_keys (11.1.0) + activerecord (~> 5.2.1) + concurrent-ruby (1.1.4) coveralls (0.8.22) json (>= 1.8, < 3) simplecov (~> 0.16.1) @@ -106,29 +109,29 @@ GEM delayed_job (>= 3.0, < 5) docile (1.3.1) dynamic_form (1.1.4) - erubi (1.7.1) + erubi (1.8.0) execjs (2.7.0) - exifr (1.3.4) + exifr (1.3.5) factory_bot (4.11.1) activesupport (>= 3.0.0) factory_bot_rails (4.11.1) factory_bot (~> 4.11.1) railties (>= 3.0.0) - faraday (0.15.3) + faraday (0.15.4) multipart-post (>= 1.2, < 3) ffi (1.9.25) fspath (3.1.0) geoip (1.6.4) globalid (0.4.1) activesupport (>= 4.2.0) - hashdiff (0.3.7) - hashie (3.5.7) + hashdiff (0.3.8) + hashie (3.6.0) htmlentities (4.3.4) http_accept_language (2.0.5) i18n (0.9.5) concurrent-ruby (~> 1.0) - i18n-js (3.1.0) - i18n (>= 0.6.6, < 2) + i18n-js (3.2.0) + i18n (>= 0.8.0, < 2) image_optim (0.26.3) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) @@ -140,8 +143,8 @@ GEM rails sprockets image_size (2.0.0) - in_threads (1.5.0) - jaro_winkler (1.5.1) + in_threads (1.5.1) + jaro_winkler (1.5.2) jquery-rails (4.3.3) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) @@ -156,7 +159,7 @@ GEM jsonify-rails (0.3.2) actionpack jsonify (< 0.4.0) - jwt (1.5.6) + jwt (2.1.0) kgio (2.11.2) libv8 (3.16.14.19) libxml-ruby (3.1.0) @@ -176,22 +179,22 @@ GEM mini_mime (>= 0.1.1) marcel (0.3.3) mimemagic (~> 0.3.2) - method_source (0.9.0) + method_source (0.9.2) mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2018.0812) - mimemagic (0.3.2) + mimemagic (0.3.3) mini_mime (1.0.1) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) minitest (5.11.3) - msgpack (1.2.4) + msgpack (1.2.6) multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) nio4r (2.3.1) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) - nokogumbo (2.0.0) + nokogiri (1.10.0) + mini_portile2 (~> 2.4.0) + nokogumbo (2.0.1) nokogiri (~> 1.8, >= 1.8.4) oauth (0.4.7) oauth-plugin (0.5.1) @@ -205,27 +208,27 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - omniauth (1.8.1) - hashie (>= 3.4.6, < 3.6.0) + omniauth (1.9.0) + hashie (>= 3.4.6, < 3.7.0) rack (>= 1.6.2, < 3) omniauth-facebook (5.0.0) omniauth-oauth2 (~> 1.2) omniauth-github (1.3.0) omniauth (~> 1.5) omniauth-oauth2 (>= 1.4.0, < 2.0) - omniauth-google-oauth2 (0.5.3) - jwt (>= 1.5) + omniauth-google-oauth2 (0.6.0) + jwt (>= 2.0) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.5) - omniauth-mediawiki (0.0.3) - jwt (~> 1.0) + omniauth-mediawiki (0.0.4) + jwt (~> 2.0) omniauth-oauth (~> 1.0) omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.5.0) + omniauth-oauth2 (1.6.0) oauth2 (~> 1.1) - omniauth (~> 1.2) + omniauth (~> 1.9) omniauth-openid (1.0.1) omniauth (~> 1.0) rack-openid (~> 1.3.1) @@ -249,12 +252,12 @@ GEM websocket-driver (>= 0.2.0) powerpack (0.1.2) progress (3.5.0) - psych (3.0.3) + psych (3.1.0) public_suffix (3.0.3) puma (3.12.0) quad_tile (1.0.1) r2 (0.2.7) - rack (2.0.5) + rack (2.0.6) rack-cors (1.0.2) rack-openid (1.3.1) rack (>= 1.1.0) @@ -262,23 +265,23 @@ GEM rack-test (1.1.0) rack (>= 1.0, < 3) rack-uri_sanitizer (0.0.2) - rails (5.2.0) - actioncable (= 5.2.0) - actionmailer (= 5.2.0) - actionpack (= 5.2.0) - actionview (= 5.2.0) - activejob (= 5.2.0) - activemodel (= 5.2.0) - activerecord (= 5.2.0) - activestorage (= 5.2.0) - activesupport (= 5.2.0) + rails (5.2.2) + actioncable (= 5.2.2) + actionmailer (= 5.2.2) + actionpack (= 5.2.2) + actionview (= 5.2.2) + activejob (= 5.2.2) + activemodel (= 5.2.2) + activerecord (= 5.2.2) + activestorage (= 5.2.2) + activesupport (= 5.2.2) bundler (>= 1.3.0) - railties (= 5.2.0) + railties (= 5.2.2) sprockets-rails (>= 2.0.0) - rails-controller-testing (1.0.2) - actionpack (~> 5.x, >= 5.0.1) - actionview (~> 5.x, >= 5.0.1) - activesupport (~> 5.x) + rails-controller-testing (1.0.4) + actionpack (>= 5.0.1.x) + actionview (>= 5.0.1.x) + activesupport (>= 5.0.1.x) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -287,17 +290,17 @@ GEM rails-i18n (4.0.2) i18n (~> 0.6) rails (>= 4.0) - railties (5.2.0) - actionpack (= 5.2.0) - activesupport (= 5.2.0) + railties (5.2.2) + actionpack (= 5.2.2) + activesupport (= 5.2.2) method_source rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) + thor (>= 0.19.0, < 2.0) rainbow (3.0.0) - rake (12.3.1) + rake (12.3.2) rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) + rb-inotify (0.10.0) + ffi (~> 1.0) record_tag_helper (1.0.0) actionview (~> 5.x) redcarpet (3.4.0) @@ -307,7 +310,7 @@ GEM rinku (2.0.4) rotp (4.0.2) addressable (~> 2.5) - rubocop (0.60.0) + rubocop (0.62.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.5, != 2.5.1.1) @@ -326,7 +329,7 @@ GEM sassc (2.0.0) ffi (~> 1.9.6) rake - sassc-rails (2.0.0) + sassc-rails (2.1.0) railties (>= 4.0.0) sassc (>= 2.0) sprockets (> 3.0) @@ -345,7 +348,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - term-ansicolor (1.6.0) + term-ansicolor (1.7.0) tins (~> 1.0) terrapin (0.6.0) climate_control (>= 0.0.3, < 1.0) @@ -354,17 +357,17 @@ GEM ref thor (0.19.4) thread_safe (0.3.6) - tilt (2.0.8) - tins (1.17.0) + tilt (2.0.9) + tins (1.20.2) tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (4.1.19) + uglifier (4.1.20) execjs (>= 0.3.0, < 3) - unicode-display_width (1.4.0) + unicode-display_width (1.4.1) validates_email_format_of (1.6.3) i18n vendorer (0.2.0) - webmock (3.4.2) + webmock (3.5.1) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff @@ -381,16 +384,18 @@ DEPENDENCIES SystemTimer (>= 1.1.3) aasm actionpack-page_caching + active_record_union annotate autoprefixer-rails (~> 8.6.3) better_errors bigdecimal (~> 1.1.0) binding_of_caller bootsnap (>= 1.1.0) + cancancan canonical-rails capybara (~> 2.13) coffee-rails (~> 4.2) - composite_primary_keys (~> 11.0.0) + composite_primary_keys (~> 11.1.0) coveralls dalli delayed_job_active_record @@ -415,8 +420,8 @@ DEPENDENCIES omniauth omniauth-facebook omniauth-github - omniauth-google-oauth2 (>= 0.2.7) - omniauth-mediawiki (>= 0.0.3) + omniauth-google-oauth2 (>= 0.6.0) + omniauth-mediawiki (>= 0.0.4) omniauth-openid omniauth-windowslive openstreetmap-deadlock_retry (>= 1.3.0) @@ -429,7 +434,7 @@ DEPENDENCIES r2 (~> 0.2.7) rack-cors rack-uri_sanitizer - rails (= 5.2.0) + rails (= 5.2.2) rails-controller-testing rails-i18n (~> 4.0.0) record_tag_helper