From: Tom Hughes <tom@compton.nu>
Date: Mon, 28 Jan 2019 19:04:02 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2120'
X-Git-Tag: live~2803
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/3e7bc943fe03dcd74666b6f26b3a831e06cac1d8?hp=-c

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

3e7bc943fe03dcd74666b6f26b3a831e06cac1d8
diff --combined Gemfile
index 3cf075045,fa14089d3..fa1bed468
--- a/Gemfile
+++ b/Gemfile
@@@ -77,7 -77,7 +77,7 @@@ gem "omniauth-openid
  gem "omniauth-windowslive"
  
  # Markdown formatting support
 -gem "redcarpet"
 +gem "kramdown"
  
  # For status transitions of Issues
  gem "aasm"
@@@ -114,6 -114,9 +114,9 @@@ gem "canonical-rails
  # Used to generate logstash friendly log files
  gem "logstasher"
  
+ # Used to generate images for traces
+ gem "gd2-ffij"
+ 
  # Gems useful for development
  group :development do
    gem "annotate"
@@@ -125,6 -128,7 +128,7 @@@ en
  
  # Gems needed for running tests
  group :test do
+   gem "fakefs", :require => "fakefs/safe"
    gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20]
    gem "rails-controller-testing"
    gem "rubocop"
diff --combined Gemfile.lock
index 3b70d157a,6f7a0919b..36e6ae9dd
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -117,10 -117,13 +117,13 @@@ GE
      factory_bot_rails (4.11.1)
        factory_bot (~> 4.11.1)
        railties (>= 3.0.0)
+     fakefs (0.18.1)
      faraday (0.15.4)
        multipart-post (>= 1.2, < 3)
      ffi (1.9.25)
      fspath (3.1.0)
+     gd2-ffij (0.3.0)
+       ffi (>= 1.0.0)
      geoip (1.6.4)
      globalid (0.4.1)
        activesupport (>= 4.2.0)
@@@ -161,7 -164,6 +164,7 @@@
        jsonify (< 0.4.0)
      jwt (2.1.0)
      kgio (2.11.2)
 +    kramdown (1.17.0)
      libv8 (3.16.14.19)
      libxml-ruby (3.1.0)
      listen (3.1.5)
@@@ -304,6 -306,7 +307,6 @@@
        ffi (~> 1.0)
      record_tag_helper (1.0.0)
        actionview (~> 5.x)
 -    redcarpet (3.4.0)
      ref (2.0.0)
      request_store (1.4.1)
        rack (>= 1.4)
@@@ -401,7 -404,9 +404,9 @@@ DEPENDENCIE
    delayed_job_active_record
    dynamic_form
    factory_bot_rails
+   fakefs
    faraday
+   gd2-ffij
    geoip
    htmlentities
    http_accept_language (~> 2.0.0)
@@@ -412,7 -417,6 +417,7 @@@
    json
    jsonify-rails
    kgio
 +  kramdown
    libxml-ruby (>= 2.0.5)
    listen
    logstasher
@@@ -439,6 -443,7 +444,6 @@@
    rails-controller-testing
    rails-i18n (~> 4.0.0)
    record_tag_helper
 -  redcarpet
    rinku (>= 1.2.2)
    rotp
    rubocop