Merge pull request #3234 from consul/use_find_instead_of_find_by_id

[Backport] Use find instead of find_by_id

app/models/concerns/sluggable.rb

@@ -3,6 +3,10 @@ module Sluggable
 
   included do
     before_validation :generate_slug, if: :generate_slug?
+
+    def self.find_by_slug_or_id(slug_or_id)
+      find_by_slug(slug_or_id) || find_by_id(slug_or_id)
+    end
   end
 
   def generate_slug