diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2018-09-13 16:57:24 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2018-09-13 16:57:24 +0000 |
| commit | e91a52619f129440b064b467b17917a7393a66a0 (patch) | |
| tree | de0eb65dcb57a8b68f7e9c95a6043c66cb958b33 | |
| parent | 733cae702222771a734db5b3b5ab8fe3e2eb7538 (diff) | |
| parent | a0bb444ce692a0f5aeb6f72e4ec07c8e673ef6e5 (diff) | |
| download | gitlab-ce-e91a52619f129440b064b467b17917a7393a66a0.tar.gz | |
Merge branch 'schema-update' into 'master'
Fix column differences in `db/schema.rb`
See merge request gitlab-org/gitlab-ce!21718
| -rw-r--r-- | db/schema.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/db/schema.rb b/db/schema.rb index 13814dd569e..d888891c8ea 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -943,8 +943,8 @@ ActiveRecord::Schema.define(version: 20180906101639) do add_index "gpg_signatures", ["project_id"], name: "index_gpg_signatures_on_project_id", using: :btree create_table "group_custom_attributes", force: :cascade do |t| - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime_with_timezone "created_at", null: false + t.datetime_with_timezone "updated_at", null: false t.integer "group_id", null: false t.string "key", null: false t.string "value", null: false @@ -1550,8 +1550,8 @@ ActiveRecord::Schema.define(version: 20180906101639) do add_index "project_ci_cd_settings", ["project_id"], name: "index_project_ci_cd_settings_on_project_id", unique: true, using: :btree create_table "project_custom_attributes", force: :cascade do |t| - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime_with_timezone "created_at", null: false + t.datetime_with_timezone "updated_at", null: false t.integer "project_id", null: false t.string "key", null: false t.string "value", null: false |