Merge pull request #16682 from untidy-hair/use_activesupport_concern

Use ActiveSupport::Concern

1 files changed, 7 insertions, 7 deletions

diff --git a/activemodel/lib/active_model/model.rb b/activemodel/lib/active_model/model.rb
index 640024eaa1..d51d6ddcc9 100644
--- a/activemodel/lib/active_model/model.rb
+++ b/activemodel/lib/active_model/model.rb
@@ -56,13 +56,13 @@ module ActiveModel
   # refer to the specific modules included in <tt>ActiveModel::Model</tt>
   # (see below).
   module Model
-    def self.included(base) #:nodoc:
-      base.class_eval do
-        extend  ActiveModel::Naming
-        extend  ActiveModel::Translation
-        include ActiveModel::Validations
-        include ActiveModel::Conversion
-      end
+    extend ActiveSupport::Concern
+    include ActiveModel::Validations
+    include ActiveModel::Conversion
+
+    included do
+      extend ActiveModel::Naming
+      extend ActiveModel::Translation
     end
 
     # Initializes a new model with the given +params+.