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

1 files changed, 3 insertions, 1 deletions

diff --git a/db/migrate/20200319124127_create_metrics_dashboard_annotations.rb b/db/migrate/20200319124127_create_metrics_dashboard_annotations.rb
index 4c57e38518a..9e10299b4f8 100644
--- a/db/migrate/20200319124127_create_metrics_dashboard_annotations.rb
+++ b/db/migrate/20200319124127_create_metrics_dashboard_annotations.rb
@@ -7,6 +7,7 @@ class CreateMetricsDashboardAnnotations < ActiveRecord::Migration[6.0]
   # Set this constant to true if this migration requires downtime.
   DOWNTIME = false
 
+  # rubocop:disable Migration/PreventStrings
   def change
     create_table :metrics_dashboard_annotations do |t|
       t.datetime_with_timezone :starting_at, null: false
@@ -15,10 +16,11 @@ class CreateMetricsDashboardAnnotations < ActiveRecord::Migration[6.0]
       t.references :cluster, index: false, foreign_key: { on_delete: :cascade }, null: true
       t.string :dashboard_path, null: false, limit: 255
       t.string :panel_xid, limit: 255
-      t.text :description, null: false, limit: 255
+      t.text :description, null: false, limit: 255 # rubocop:disable Migration/AddLimitToTextColumns
 
       t.index %i(environment_id dashboard_path starting_at ending_at), where: 'environment_id IS NOT NULL', name: "index_metrics_dashboard_annotations_on_environment_id_and_3_col"
       t.index %i(cluster_id dashboard_path starting_at ending_at), where: 'cluster_id IS NOT NULL', name: "index_metrics_dashboard_annotations_on_cluster_id_and_3_columns"
     end
   end
+  # rubocop:enable Migration/PreventStrings
 end