From: Tom Hughes <tom@compton.nu>
Date: Mon, 10 Jun 2019 20:29:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2204'
X-Git-Tag: live~2579
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/6db326aa1f084a062a3b658876bc01bf650f5702?hp=-c

Merge remote-tracking branch 'upstream/pull/2204'
---

6db326aa1f084a062a3b658876bc01bf650f5702
diff --combined Gemfile
index f0e388503,6c867193c..dc1615ffc
--- a/Gemfile
+++ b/Gemfile
@@@ -13,7 -13,7 +13,7 @@@ gem "psych", :platforms => :ruby_2
  gem "json"
  
  # Use postgres as the database
 -gem "pg", "~> 0.18"
 +gem "pg"
  
  # Use SCSS for stylesheets
  gem "sassc-rails"
@@@ -60,8 -60,7 +60,8 @@@ gem "paperclip", "~> 5.2
  gem "rack-cors"
  gem "rails-i18n", "~> 4.0.0"
  gem "record_tag_helper"
 -gem "rinku", "= 2.0.4", :require => "rails_rinku"
 +gem "rinku", ">= 2.0.6", :require => "rails_rinku"
 +gem "strong_migrations"
  gem "validates_email_format_of", ">= 1.5.1"
  
  # Native OSM extensions
@@@ -118,7 -117,7 +118,7 @@@ gem "canonical-rails
  gem "logstasher"
  
  # Used to generate images for traces
- gem "gd2-ffij"
+ gem "gd2-ffij", ">= 0.4.0"
  
  # Used for browser detection
  gem "browser"
@@@ -138,8 -137,6 +138,8 @@@ group :test d
    gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20]
    gem "rails-controller-testing"
    gem "rubocop"
 +  gem "rubocop-performance"
 +  gem "rubocop-rails"
    gem "webmock"
  end
  
@@@ -148,10 -145,8 +148,10 @@@ group :development, :test d
    gem "capybara", "~> 2.13"
    gem "coveralls", :require => false
    gem "erb_lint", :require => false
 +  gem "eslint-rails-ee"
 +  gem "execjs"
    gem "factory_bot_rails"
 -  gem "jshint"
    gem "poltergeist"
    gem "puma", "~> 3.7"
 +  gem "therubyracer", :platforms => :ruby
  end
diff --combined Gemfile.lock
index de5157c04,a696aaaa9..479818938
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -2,7 -2,7 +2,7 @@@ GE
    remote: https://rubygems.org/
    specs:
      SystemTimer (1.2.3)
 -    aasm (5.0.2)
 +    aasm (5.0.5)
        concurrent-ruby (~> 1.0)
      actioncable (5.2.3)
        actionpack (= 5.2.3)
@@@ -40,7 -40,7 +40,7 @@@
        activemodel (= 5.2.3)
        activesupport (= 5.2.3)
        arel (>= 9.0)
 -    activerecord-import (1.0.1)
 +    activerecord-import (1.0.2)
        activerecord (>= 3.2)
      activestorage (5.2.3)
        actionpack (= 5.2.3)
@@@ -53,8 -53,8 +53,8 @@@
        tzinfo (~> 1.1)
      addressable (2.6.0)
        public_suffix (>= 2.0.2, < 4.0)
 -    annotate (2.7.4)
 -      activerecord (>= 3.2, < 6.0)
 +    annotate (2.7.5)
 +      activerecord (>= 3.2, < 7.0)
        rake (>= 10.4, < 13.0)
      arel (9.0.0)
      ast (2.4.0)
@@@ -75,11 -75,11 +75,11 @@@
      bigdecimal (1.1.0)
      binding_of_caller (0.8.0)
        debug_inspector (>= 0.0.1)
 -    bootsnap (1.4.2)
 +    bootsnap (1.4.4)
        msgpack (~> 1.0)
      browser (2.5.3)
      builder (3.2.3)
 -    cancancan (2.3.0)
 +    cancancan (3.0.1)
      canonical-rails (0.2.5)
        rails (>= 4.1, < 6.1)
      capybara (2.18.0)
@@@ -99,7 -99,6 +99,7 @@@
        coffee-script-source
        execjs
      coffee-script-source (1.12.2)
 +    colorize (0.8.1)
      composite_primary_keys (11.1.0)
        activerecord (~> 5.2.1)
      concurrent-ruby (1.1.5)
@@@ -107,11 -106,11 +107,11 @@@
        activesupport (>= 3.0)
        deep_merge (~> 1.2.1)
        dry-validation (>= 0.12.2)
 -    coveralls (0.8.22)
 +    coveralls (0.8.23)
        json (>= 1.8, < 3)
        simplecov (~> 0.16.1)
        term-ansicolor (~> 1.3)
 -      thor (~> 0.19.4)
 +      thor (>= 0.19.4, < 2.0)
        tins (~> 1.6)
      crack (0.4.3)
        safe_yaml (~> 1.0.0)
@@@ -125,7 -124,7 +125,7 @@@
        activerecord (>= 3.0, < 5.3)
        delayed_job (>= 3.0, < 5)
      docile (1.3.1)
 -    dry-configurable (0.8.2)
 +    dry-configurable (0.8.3)
        concurrent-ruby (~> 1.0)
        dry-core (~> 0.4, >= 0.4.7)
      dry-container (0.7.0)
@@@ -135,8 -134,8 +135,8 @@@
        concurrent-ruby (~> 1.0)
      dry-equalizer (0.2.2)
      dry-inflector (0.1.2)
 -    dry-logic (0.5.0)
 -      dry-container (~> 0.2, >= 0.2.6)
 +    dry-logic (0.6.1)
 +      concurrent-ruby (~> 1.0)
        dry-core (~> 0.2)
        dry-equalizer (~> 0.2)
      dry-types (0.14.1)
@@@ -146,7 -145,7 +146,7 @@@
        dry-equalizer (~> 0.2)
        dry-inflector (~> 0.1, >= 0.1.2)
        dry-logic (~> 0.5, >= 0.5)
 -    dry-validation (0.13.1)
 +    dry-validation (0.13.3)
        concurrent-ruby (~> 1.0)
        dry-configurable (~> 0.1, >= 0.1.3)
        dry-core (~> 0.2, >= 0.2.1)
@@@ -162,60 -161,60 +162,60 @@@
        rubocop (~> 0.51)
        smart_properties
      erubi (1.8.0)
 +    eslint-rails-ee (1.0.2)
 +      colorize
 +      execjs
 +      railties (>= 3.2)
      execjs (2.7.0)
      exifr (1.3.6)
      factory_bot (5.0.2)
        activesupport (>= 4.2.0)
 -    factory_bot_rails (5.0.1)
 -      factory_bot (~> 5.0.0)
 +    factory_bot_rails (5.0.2)
 +      factory_bot (~> 5.0.2)
        railties (>= 4.2.0)
 -    fakefs (0.20.0)
 +    fakefs (0.20.1)
      faraday (0.15.4)
        multipart-post (>= 1.2, < 3)
 -    ffi (1.10.0)
 -    fspath (3.1.0)
 +    ffi (1.11.1)
 +    fspath (3.1.1)
-     gd2-ffij (0.3.0)
+     gd2-ffij (0.4.0)
        ffi (>= 1.0.0)
      geoip (1.6.4)
      globalid (0.4.2)
        activesupport (>= 4.2.0)
 -    hashdiff (0.3.8)
 +    hashdiff (0.4.0)
      hashie (3.6.0)
      html_tokenizer (0.0.7)
      htmlentities (4.3.4)
      http_accept_language (2.0.5)
      i18n (0.9.5)
        concurrent-ruby (~> 1.0)
 -    i18n-js (3.2.1)
 +    i18n-js (3.2.3)
        i18n (>= 0.6.6)
 -    image_optim (0.26.3)
 +    image_optim (0.26.4)
        exifr (~> 1.2, >= 1.2.2)
        fspath (~> 3.0)
        image_size (>= 1.5, < 3)
        in_threads (~> 1.3)
        progress (~> 3.0, >= 3.0.1)
 -    image_optim_rails (0.4.1)
 +    image_optim_rails (0.4.2)
        image_optim (~> 0.24)
        rails
        sprockets
 -    image_size (2.0.0)
 -    in_threads (1.5.1)
 +    image_size (2.0.1)
 +    in_threads (1.5.2)
      jaro_winkler (1.5.2)
      jquery-rails (4.3.3)
        rails-dom-testing (>= 1, < 3)
        railties (>= 4.2.0)
        thor (>= 0.14, < 2.0)
 -    jshint (1.5.0)
 -      execjs (>= 1.4.0)
 -      multi_json (~> 1.0)
 -      therubyracer (~> 0.12.1)
      json (2.2.0)
      jsonify (0.3.1)
        multi_json (~> 1.0)
      jsonify-rails (0.3.2)
        actionpack
        jsonify (< 0.4.0)
 -    jwt (2.1.0)
 +    jwt (2.2.1)
      kgio (2.11.2)
      kramdown (2.1.0)
      libv8 (3.16.14.19)
@@@ -239,17 -238,17 +239,17 @@@
      method_source (0.9.2)
      mime-types (3.2.2)
        mime-types-data (~> 3.2015)
 -    mime-types-data (3.2018.0812)
 +    mime-types-data (3.2019.0331)
      mimemagic (0.3.3)
      mini_mime (1.0.1)
      mini_portile2 (2.4.0)
      minitest (5.11.3)
 -    msgpack (1.2.9)
 +    msgpack (1.2.10)
      multi_json (1.13.1)
      multi_xml (0.6.0)
 -    multipart-post (2.0.0)
 +    multipart-post (2.1.1)
      nio4r (2.3.1)
 -    nokogiri (1.10.2)
 +    nokogiri (1.10.3)
        mini_portile2 (~> 2.4.0)
      nokogumbo (2.0.1)
        nokogiri (~> 1.8, >= 1.8.4)
@@@ -273,7 -272,7 +273,7 @@@
      omniauth-github (1.3.0)
        omniauth (~> 1.5)
        omniauth-oauth2 (>= 1.4.0, < 2.0)
 -    omniauth-google-oauth2 (0.6.1)
 +    omniauth-google-oauth2 (0.7.0)
        jwt (>= 2.0)
        omniauth (>= 1.1.1)
        omniauth-oauth2 (>= 1.5)
@@@ -299,21 -298,21 +299,21 @@@
        mime-types
        mimemagic (~> 0.3.0)
        terrapin (~> 0.6.0)
 -    parallel (1.16.0)
 -    parser (2.6.2.0)
 +    parallel (1.17.0)
 +    parser (2.6.3.0)
        ast (~> 2.4.0)
 -    pg (0.21.0)
 +    pg (1.1.4)
      poltergeist (1.18.1)
        capybara (>= 2.1, < 4)
        cliver (~> 0.3.1)
        websocket-driver (>= 0.2.0)
 -    progress (3.5.0)
 +    progress (3.5.1)
      psych (3.1.0)
 -    public_suffix (3.0.3)
 +    public_suffix (3.1.0)
      puma (3.12.1)
      quad_tile (1.0.1)
      r2 (0.2.7)
 -    rack (2.0.6)
 +    rack (2.0.7)
      rack-cors (1.0.3)
      rack-openid (1.3.1)
        rack (>= 1.1.0)
@@@ -362,23 -361,19 +362,23 @@@
      ref (2.0.0)
      request_store (1.4.1)
        rack (>= 1.4)
 -    rinku (2.0.4)
 -    rotp (4.1.0)
 +    rinku (2.0.6)
 +    rotp (5.0.0)
        addressable (~> 2.5)
 -    rubocop (0.66.0)
 +    rubocop (0.71.0)
        jaro_winkler (~> 1.5.1)
        parallel (~> 1.10)
 -      parser (>= 2.5, != 2.5.1.1)
 -      psych (>= 3.1.0)
 +      parser (>= 2.6)
        rainbow (>= 2.2.2, < 4.0)
        ruby-progressbar (~> 1.7)
 -      unicode-display_width (>= 1.4.0, < 1.6)
 +      unicode-display_width (>= 1.4.0, < 1.7)
 +    rubocop-performance (1.3.0)
 +      rubocop (>= 0.68.0)
 +    rubocop-rails (2.0.0)
 +      rack (>= 2.0)
 +      rubocop (>= 0.70.0)
      ruby-openid (2.7.0)
 -    ruby-progressbar (1.10.0)
 +    ruby-progressbar (1.10.1)
      ruby_dep (1.5.0)
      safe_yaml (1.0.5)
      sanitize (5.0.0)
@@@ -388,7 -383,7 +388,7 @@@
      sassc (2.0.1)
        ffi (~> 1.9)
        rake
 -    sassc-rails (2.1.0)
 +    sassc-rails (2.1.1)
        railties (>= 4.0.0)
        sassc (>= 2.0)
        sprockets (> 3.0)
@@@ -400,7 -395,7 +400,7 @@@
        json (>= 1.8, < 3)
        simplecov-html (~> 0.10.0)
      simplecov-html (0.10.2)
 -    smart_properties (1.13.1)
 +    smart_properties (1.14.0)
      sprockets (3.7.2)
        concurrent-ruby (~> 1.0)
        rack (> 1, < 3)
@@@ -408,8 -403,6 +408,8 @@@
        actionpack (>= 4.0)
        activesupport (>= 4.0)
        sprockets (>= 3.0.0)
 +    strong_migrations (0.4.0)
 +      activerecord (>= 5)
      term-ansicolor (1.7.1)
        tins (~> 1.0)
      terrapin (0.6.0)
@@@ -417,22 -410,22 +417,22 @@@
      therubyracer (0.12.3)
        libv8 (~> 3.16.14.15)
        ref
 -    thor (0.19.4)
 +    thor (0.20.3)
      thread_safe (0.3.6)
      tilt (2.0.9)
 -    tins (1.20.2)
 +    tins (1.20.3)
      tzinfo (1.2.5)
        thread_safe (~> 0.1)
      uglifier (4.1.20)
        execjs (>= 0.3.0, < 3)
 -    unicode-display_width (1.5.0)
 +    unicode-display_width (1.6.0)
      validates_email_format_of (1.6.3)
        i18n
      vendorer (0.2.0)
 -    webmock (3.5.1)
 +    webmock (3.6.0)
        addressable (>= 2.3.6)
        crack (>= 0.3.2)
 -      hashdiff
 +      hashdiff (>= 0.4.0, < 2.0.0)
      websocket-driver (0.7.0)
        websocket-extensions (>= 0.1.0)
      websocket-extensions (0.1.3)
@@@ -466,18 -459,17 +466,18 @@@ DEPENDENCIE
    delayed_job_active_record
    dynamic_form
    erb_lint
 +  eslint-rails-ee
 +  execjs
    factory_bot_rails
    fakefs
    faraday
-   gd2-ffij
+   gd2-ffij (>= 0.4.0)
    geoip
    htmlentities
    http_accept_language (~> 2.0.0)
    i18n-js (>= 3.0.0)
    image_optim_rails
    jquery-rails
 -  jshint
    json
    jsonify-rails
    kgio
@@@ -496,7 -488,7 +496,7 @@@
    omniauth-windowslive
    openstreetmap-deadlock_retry (>= 1.3.0)
    paperclip (~> 5.2)
 -  pg (~> 0.18)
 +  pg
    poltergeist
    psych
    puma (~> 3.7)
@@@ -508,16 -500,12 +508,16 @@@
    rails-controller-testing
    rails-i18n (~> 4.0.0)
    record_tag_helper
 -  rinku (= 2.0.4)
 +  rinku (>= 2.0.6)
    rotp
    rubocop
 +  rubocop-performance
 +  rubocop-rails
    sanitize
    sassc-rails
    secure_headers
 +  strong_migrations
 +  therubyracer
    uglifier (>= 1.3.0)
    validates_email_format_of (>= 1.5.1)
    vendorer