From: Tom Hughes <tom@compton.nu>
Date: Sat, 16 Jun 2018 10:45:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1576'
X-Git-Tag: live~3065
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7441f15b4fd59735ae00a16b47cfcf7eb99260a6?hp=-c

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

7441f15b4fd59735ae00a16b47cfcf7eb99260a6
diff --combined Gemfile
index addc105d8,ef14d06c5..78e2aac97
--- a/Gemfile
+++ b/Gemfile
@@@ -55,9 -55,6 +55,9 @@@ gem "record_tag_helper
  gem "rinku", ">= 1.2.2", :require => "rails_rinku"
  gem "validates_email_format_of", ">= 1.5.1"
  
 +# Native OSM extensions
 +gem "quad_tile", "~> 1.0.1"
 +
  # Sanitise URIs
  gem "rack-uri_sanitizer"
  
@@@ -73,6 -70,9 +73,9 @@@ gem "omniauth-windowslive
  # Markdown formatting support
  gem "redcarpet"
  
+ # For status transitions of Issues
+ gem "aasm"
+ 
  # Load libxml support for XML parsing and generation
  gem "libxml-ruby", ">= 2.0.5", :require => "libxml"
  
diff --combined Gemfile.lock
index bdf42eeb6,49f9b5977..417a7634a
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -2,6 -2,7 +2,7 @@@ GE
    remote: https://rubygems.org/
    specs:
      SystemTimer (1.2.3)
+     aasm (4.1.0)
      actioncable (5.1.5)
        actionpack (= 5.1.5)
        nio4r (~> 2.0)
@@@ -235,7 -236,6 +236,7 @@@
      psych (3.0.2)
      public_suffix (3.0.2)
      puma (3.11.4)
 +    quad_tile (1.0.1)
      r2 (0.2.7)
      rack (2.0.5)
      rack-cors (1.0.2)
@@@ -361,6 -361,7 +362,7 @@@ PLATFORM
  
  DEPENDENCIES
    SystemTimer (>= 1.1.3)
+   aasm
    actionpack-page_caching
    annotate
    autoprefixer-rails
@@@ -404,7 -405,6 +406,7 @@@
    poltergeist
    psych
    puma (~> 3.7)
 +  quad_tile (~> 1.0.1)
    r2 (~> 0.2.7)
    rack-cors
    rack-uri_sanitizer