Merge branch…

Merge branch '42172-deprecation-warning-timestamps-was-called-without-specifying-an-option-for-null-in-rails-5-this-behavior-will-change-to-null-false' into 'master' Resolve "DEPRECATION WARNING: `#timestamps` was called without specifying an option for `null`. In Rails 5, this behavior will change to `null: false`..." Closes #42172 See merge request gitlab-org/gitlab-ce!16545

Merge branch…
ee587631 · Douwe Maan · 624092bf · e9b92715 · ee587631
Commit ee587631 authored Jan 18, 2018 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

20170425112128_create_pipeline_schedules_table.rb db/migrate/20170425112128_create_pipeline_schedules_table.rb +1 -1

No files found.
--- a/db/migrate/20170425112128_create_pipeline_schedules_table.rb
+++ b/db/migrate/20170425112128_create_pipeline_schedules_table.rb
@@ -17,7 +17,7 @@ class CreatePipelineSchedulesTable < ActiveRecord::Migration
      t.boolean :active, default: true
      t.datetime :deleted_at

-      t.timestamps
+      t.timestamps null: true
    end

    add_index(:ci_pipeline_schedules, :project_id)