From: Tom Hughes <tom@compton.nu>
Date: Sat, 3 Nov 2018 14:34:18 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2023'
X-Git-Tag: live~3354
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/16bef0c8ecad24ac0ca93963196bc844adbb57de?hp=--cc

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

16bef0c8ecad24ac0ca93963196bc844adbb57de
diff --cc Gemfile
index d60f1ba94,b559027c2..05bfc6cbd
--- a/Gemfile
+++ b/Gemfile
@@@ -45,8 -45,8 +45,9 @@@ gem "image_optim_rails
  
  # Load rails plugins
  gem "actionpack-page_caching"
+ gem "cancancan"
  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"