From: Tom Hughes <tom@compton.nu>
Date: Thu, 1 Nov 2018 18:01:25 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2037'
X-Git-Tag: live~3857
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/0e7cc08c7b1055341dc01cfdc331fac1a13964c1?ds=sidebyside;hp=-c

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

0e7cc08c7b1055341dc01cfdc331fac1a13964c1
diff --combined Gemfile
index 390728030,d60f1ba94..9e86b5ec7
--- a/Gemfile
+++ b/Gemfile
@@@ -16,7 -16,7 +16,7 @@@ gem "json
  gem "pg", "~> 0.18"
  
  # Use SCSS for stylesheets
 -gem "sassc-rails"
 +gem "sassc-rails", "~> 1.3"
  
  # Use Uglifier as compressor for JavaScript assets
  gem "uglifier", ">= 1.3.0"
@@@ -46,6 -46,7 +46,7 @@@ gem "image_optim_rails
  # Load rails plugins
  gem "actionpack-page_caching"
  gem "composite_primary_keys", "~> 11.0.0"
+ gem "delayed_job_active_record"
  gem "dynamic_form"
  gem "http_accept_language", "~> 2.0.0"
  gem "i18n-js", ">= 3.0.0"
diff --combined Gemfile.lock
index 033fed118,9080f009e..08514dcda
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -21,7 -21,7 +21,7 @@@ GE
        rack-test (>= 0.6.3)
        rails-dom-testing (~> 2.0)
        rails-html-sanitizer (~> 1.0, >= 1.0.2)
 -    actionpack-page_caching (1.1.0)
 +    actionpack-page_caching (1.1.1)
        actionpack (>= 4.0.0, < 6)
      actionview (5.2.0)
        activesupport (= 5.2.0)
@@@ -87,7 -87,7 +87,7 @@@
      coffee-script-source (1.12.2)
      composite_primary_keys (11.0.3)
        activerecord (~> 5.2.0)
 -    concurrent-ruby (1.0.5)
 +    concurrent-ruby (1.1.0)
      coveralls (0.8.22)
        json (>= 1.8, < 3)
        simplecov (~> 0.16.1)
@@@ -97,8 -97,13 +97,13 @@@
      crack (0.4.3)
        safe_yaml (~> 1.0.0)
      crass (1.0.4)
 -    dalli (2.7.8)
 +    dalli (2.7.9)
      debug_inspector (0.0.3)
+     delayed_job (4.1.5)
+       activesupport (>= 3.0, < 5.3)
+     delayed_job_active_record (4.1.3)
+       activerecord (>= 3.0, < 5.3)
+       delayed_job (>= 3.0, < 5)
      docile (1.3.1)
      dynamic_form (1.1.4)
      erubi (1.7.1)
@@@ -109,7 -114,7 +114,7 @@@
      factory_bot_rails (4.11.1)
        factory_bot (~> 4.11.1)
        railties (>= 3.0.0)
 -    faraday (0.12.2)
 +    faraday (0.15.3)
        multipart-post (>= 1.2, < 3)
      ffi (1.9.25)
      fspath (3.1.0)
@@@ -124,7 -129,7 +129,7 @@@
        concurrent-ruby (~> 1.0)
      i18n-js (3.0.11)
        i18n (>= 0.6.6, < 2)
 -    image_optim (0.26.2)
 +    image_optim (0.26.3)
        exifr (~> 1.2, >= 1.2.2)
        fspath (~> 3.0)
        image_size (>= 1.5, < 3)
@@@ -160,14 -165,14 +165,14 @@@
        rb-inotify (~> 0.9, >= 0.9.7)
        ruby_dep (~> 1.2)
      logstash-event (1.2.02)
 -    logstasher (1.2.2)
 +    logstasher (1.3.0)
        activesupport (>= 4.0)
        logstash-event (~> 1.2.0)
        request_store
 -    loofah (2.2.2)
 +    loofah (2.2.3)
        crass (~> 1.0.2)
        nokogiri (>= 1.5.9)
 -    mail (2.7.0)
 +    mail (2.7.1)
        mini_mime (>= 0.1.1)
      marcel (0.3.3)
        mimemagic (~> 0.3.2)
@@@ -184,19 -189,19 +189,19 @@@
      multi_xml (0.6.0)
      multipart-post (2.0.0)
      nio4r (2.3.1)
 -    nokogiri (1.8.4)
 +    nokogiri (1.8.5)
        mini_portile2 (~> 2.3.0)
 -    nokogumbo (1.5.0)
 -      nokogiri
 +    nokogumbo (2.0.0)
 +      nokogiri (~> 1.8, >= 1.8.4)
      oauth (0.4.7)
      oauth-plugin (0.5.1)
        multi_json
        oauth (~> 0.4.4)
        oauth2 (>= 0.5.0)
        rack
 -    oauth2 (1.4.0)
 -      faraday (>= 0.8, < 0.13)
 -      jwt (~> 1.0)
 +    oauth2 (1.4.1)
 +      faraday (>= 0.8, < 0.16.0)
 +      jwt (>= 1.0, < 3.0)
        multi_json (~> 1.3)
        multi_xml (~> 0.5)
        rack (>= 1.2, < 3)
@@@ -235,7 -240,7 +240,7 @@@
        mimemagic (~> 0.3.0)
        terrapin (~> 0.6.0)
      parallel (1.12.1)
 -    parser (2.5.1.2)
 +    parser (2.5.3.0)
        ast (~> 2.4.0)
      pg (0.21.0)
      poltergeist (1.18.1)
@@@ -243,8 -248,8 +248,8 @@@
        cliver (~> 0.3.1)
        websocket-driver (>= 0.2.0)
      powerpack (0.1.2)
 -    progress (3.4.0)
 -    psych (3.0.2)
 +    progress (3.5.0)
 +    psych (3.0.3)
      public_suffix (3.0.3)
      puma (3.12.0)
      quad_tile (1.0.1)
@@@ -301,22 -306,22 +306,22 @@@
        rack (>= 1.4)
      rinku (2.0.4)
      rotp (3.3.1)
 -    rubocop (0.59.1)
 +    rubocop (0.60.0)
        jaro_winkler (~> 1.5.1)
        parallel (~> 1.10)
        parser (>= 2.5, != 2.5.1.1)
        powerpack (~> 0.1)
        rainbow (>= 2.2.2, < 4.0)
        ruby-progressbar (~> 1.7)
 -      unicode-display_width (~> 1.0, >= 1.0.1)
 +      unicode-display_width (~> 1.4.0)
      ruby-openid (2.7.0)
      ruby-progressbar (1.10.0)
      ruby_dep (1.5.0)
      safe_yaml (1.0.4)
 -    sanitize (4.6.6)
 +    sanitize (5.0.0)
        crass (~> 1.0.2)
 -      nokogiri (>= 1.4.4)
 -      nokogumbo (~> 1.4)
 +      nokogiri (>= 1.8.0)
 +      nokogumbo (~> 2.0)
      sass (3.6.0)
        sass-listen (~> 4.0.0)
      sass-listen (4.0.0)
@@@ -355,7 -360,7 +360,7 @@@
      thor (0.19.4)
      thread_safe (0.3.6)
      tilt (2.0.8)
 -    tins (1.16.3)
 +    tins (1.17.0)
      tzinfo (1.2.5)
        thread_safe (~> 0.1)
      uglifier (4.1.19)
@@@ -363,7 -368,7 +368,7 @@@
      unicode-display_width (1.4.0)
      validates_email_format_of (1.6.3)
        i18n
 -    vendorer (0.1.16)
 +    vendorer (0.2.0)
      webmock (3.4.2)
        addressable (>= 2.3.6)
        crack (>= 0.3.2)
@@@ -371,7 -376,7 +376,7 @@@
      websocket-driver (0.7.0)
        websocket-extensions (>= 0.1.0)
      websocket-extensions (0.1.3)
 -    xpath (3.1.0)
 +    xpath (3.2.0)
        nokogiri (~> 1.8)
  
  PLATFORMS
@@@ -393,6 -398,7 +398,7 @@@ DEPENDENCIE
    composite_primary_keys (~> 11.0.0)
    coveralls
    dalli
+   delayed_job_active_record
    dynamic_form
    factory_bot_rails
    faraday
@@@ -437,7 -443,7 +443,7 @@@
    rotp
    rubocop
    sanitize
 -  sassc-rails
 +  sassc-rails (~> 1.3)
    secure_headers
    uglifier (>= 1.3.0)
    validates_email_format_of (>= 1.5.1)