summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-01-18 13:52:19 +0000
committerDouwe Maan <douwe@gitlab.com>2018-01-18 13:52:19 +0000
commitee58763158ed10f12a8fe7c089257a532fe6e724 (patch)
tree5b9c0c98540e9632a11a411543302616fb46a0a4
parent624092bf7a80028b3192ee0980e2cb08de6b810c (diff)
parente9b92715de24820803e460b39b60e1a4b7f3f6b3 (diff)
downloadgitlab-ce-ee58763158ed10f12a8fe7c089257a532fe6e724.tar.gz
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
-rw-r--r--db/migrate/20170425112128_create_pipeline_schedules_table.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/db/migrate/20170425112128_create_pipeline_schedules_table.rb b/db/migrate/20170425112128_create_pipeline_schedules_table.rb
index 57df47f5f42..4f9c56a1ad8 100644
--- 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)