Add latest changes from gitlab-org/gitlab@13-0-stable-ee

1 files changed, 5 insertions, 3 deletions

diff --git a/db/migrate/20190402150158_backport_enterprise_schema.rb b/db/migrate/20190402150158_backport_enterprise_schema.rb
index d1e911a04e6..694c0feba0a 100644
--- a/db/migrate/20190402150158_backport_enterprise_schema.rb
+++ b/db/migrate/20190402150158_backport_enterprise_schema.rb
@@ -2,7 +2,8 @@
 
 # rubocop: disable Metrics/AbcSize
 # rubocop: disable Migration/Datetime
-# rubocop: disable Migration/AddLimitToStringColumns
+# rubocop: disable Migration/PreventStrings
+# rubocop: disable Migration/AddLimitToTextColumns
 class BackportEnterpriseSchema < ActiveRecord::Migration[5.0]
   include Gitlab::Database::MigrationHelpers
 
@@ -197,7 +198,7 @@ class BackportEnterpriseSchema < ActiveRecord::Migration[5.0]
 
   def add_column_with_default_if_not_exists(table, name, *args)
     unless column_exists?(table, name)
-      add_column_with_default(table, name, *args)
+      add_column_with_default(table, name, *args) # rubocop:disable Migration/AddColumnWithDefault
     end
   end
 
@@ -2188,4 +2189,5 @@ class BackportEnterpriseSchema < ActiveRecord::Migration[5.0]
 end
 # rubocop: enable Metrics/AbcSize
 # rubocop: enable Migration/Datetime
-# rubocop: enable Migration/AddLimitToStringColumns
+# rubocop: enable Migration/PreventStrings
+# rubocop: enable Migration/AddLimitToTextColumns