Merge branch 'master' of gitlab_gitlab:gitlab-org/gitlab-cerunner-metrics-extractor

1 files changed, 4 insertions, 2 deletions

diff --git a/db/migrate/20180511131058_create_clusters_applications_jupyter.rb b/db/migrate/20180511131058_create_clusters_applications_jupyter.rb
index 749aeeb4792..4633d930e2d 100644
--- a/db/migrate/20180511131058_create_clusters_applications_jupyter.rb
+++ b/db/migrate/20180511131058_create_clusters_applications_jupyter.rb
@@ -7,17 +7,19 @@ class CreateClustersApplicationsJupyter < ActiveRecord::Migration[4.2]
   DOWNTIME = false
 
   def change
+    # rubocop:disable Migration/AddLimitToStringColumns
     create_table :clusters_applications_jupyter do |t|
       t.references :cluster, null: false, unique: true, foreign_key: { on_delete: :cascade }
       t.references :oauth_application, foreign_key: { on_delete: :nullify }
 
       t.integer :status, null: false
-      t.string :version, null: false
-      t.string :hostname
+      t.string :version, null: false # rubocop:disable Migration/AddLimitToStringColumns
+      t.string :hostname # rubocop:disable Migration/AddLimitToStringColumns
 
       t.timestamps_with_timezone null: false
 
       t.text :status_reason
     end
+    # rubocop:enable Migration/AddLimitToStringColumns
   end
 end