Merge branch 'sh-redact-links-remove-circular-dependency-ce' into 'master'

Remove circular dependency on Redactable in migration

See merge request gitlab-org/gitlab-ce!22951

lib/gitlab/background_migration/redact_links.rb

 # frozen_string_literal: true
 # rubocop:disable Style/Documentation
 
+require_relative 'redact_links/redactable'
+
 module Gitlab
   module BackgroundMigration
     class RedactLinks
-      module Redactable
-        extend ActiveSupport::Concern
-
-        def redact_field!(field)
-          self[field].gsub!(%r{/sent_notifications/\h{32}/unsubscribe}, '/sent_notifications/REDACTED/unsubscribe')
-
-          if self.changed?
-            self.update_columns(field => self[field],
-                                "#{field}_html" => nil)
-          end
-        end
-      end
-
       class Note < ActiveRecord::Base
         include EachBatch
-        include Redactable
+        include ::Gitlab::BackgroundMigration::RedactLinks::Redactable
 
         self.table_name = 'notes'
         self.inheritance_column = :_type_disabled
@@ -27,7 +16,7 @@ module Gitlab
 
       class Issue < ActiveRecord::Base
         include EachBatch
-        include Redactable
+        include ::Gitlab::BackgroundMigration::RedactLinks::Redactable
 
         self.table_name = 'issues'
         self.inheritance_column = :_type_disabled
@@ -35,7 +24,7 @@ module Gitlab
 
       class MergeRequest < ActiveRecord::Base
         include EachBatch
-        include Redactable
+        include ::Gitlab::BackgroundMigration::RedactLinks::Redactable
 
         self.table_name = 'merge_requests'
         self.inheritance_column = :_type_disabled
@@ -43,7 +32,7 @@ module Gitlab
 
       class Snippet < ActiveRecord::Base
         include EachBatch
-        include Redactable
+        include ::Gitlab::BackgroundMigration::RedactLinks::Redactable
 
         self.table_name = 'snippets'
         self.inheritance_column = :_type_disabled

lib/gitlab/background_migration/redact_links/redactable.rb

+# frozen_string_literal: true
+# rubocop:disable Style/Documentation
+
+module Gitlab
+  module BackgroundMigration
+    class RedactLinks
+      module Redactable
+        extend ActiveSupport::Concern
+
+        def redact_field!(field)
+          self[field].gsub!(%r{/sent_notifications/\h{32}/unsubscribe}, '/sent_notifications/REDACTED/unsubscribe')
+
+          if self.changed?
+            self.update_columns(field => self[field],
+                                "#{field}_html" => nil)
+          end
+        end
+      end
+    end
+  end
+end