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

app/models/concerns/consistency_validations.rb

@@ -1,4 +1,6 @@
 module ConsistencyValidations
+  extend ActiveSupport::Concern
+
   # Generic checks that are run for the updates and deletes of
   # node, ways and relations. This code is here to avoid duplication,
   # and allow the extention of the checks without having to modify the

app/models/concerns/redactable.rb

@@ -1,10 +1,8 @@
-require "osm"
-
 module Redactable
-  def self.included(base)
-    # this is used to extend activerecord bases, as these aren't
-    # in scope for the module itself.
-    base.scope :unredacted, -> { where(:redaction_id => nil) }
+  extend ActiveSupport::Concern
+
+  included do
+    scope :unredacted, -> { where(:redaction_id => nil) }
   end
 
   def redacted?