diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 21:09:46 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 21:09:46 +0000 |
| commit | 6867eff1f997a881cd3ea64109f7ba2d4b42fde4 (patch) | |
| tree | a0d4b0ced920ff41311e578b406ed9a7136e8f42 /db | |
| parent | 3290d46655f07d7ae3dca788d6df9f326972ffd8 (diff) | |
| download | gitlab-ce-6867eff1f997a881cd3ea64109f7ba2d4b42fde4.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
4 files changed, 7 insertions, 4 deletions
diff --git a/db/migrate/20171230123729_init_schema.rb b/db/migrate/20171230123729_init_schema.rb index a474ea2f925..79c9ebbb691 100644 --- a/db/migrate/20171230123729_init_schema.rb +++ b/db/migrate/20171230123729_init_schema.rb @@ -6,6 +6,7 @@ # rubocop:disable Migration/AddConcurrentForeignKey # rubocop:disable Style/WordArray # rubocop:disable Migration/AddLimitToStringColumns +# rubocop:disable Migration/Datetime class InitSchema < ActiveRecord::Migration[4.2] DOWNTIME = false diff --git a/db/migrate/20180116193854_create_lfs_file_locks.rb b/db/migrate/20180116193854_create_lfs_file_locks.rb index 2dd0e71916b..b94f69ad42e 100644 --- a/db/migrate/20180116193854_create_lfs_file_locks.rb +++ b/db/migrate/20180116193854_create_lfs_file_locks.rb @@ -9,7 +9,7 @@ class CreateLfsFileLocks < ActiveRecord::Migration[4.2] create_table :lfs_file_locks do |t| t.references :project, null: false, foreign_key: { on_delete: :cascade } t.references :user, null: false, index: true, foreign_key: { on_delete: :cascade } - t.datetime :created_at, null: false + t.datetime :created_at, null: false # rubocop:disable Migration/Datetime t.string :path, limit: 511 end diff --git a/db/migrate/20180503131624_create_remote_mirrors.rb b/db/migrate/20180503131624_create_remote_mirrors.rb index a079c1b3328..80090c14314 100644 --- a/db/migrate/20180503131624_create_remote_mirrors.rb +++ b/db/migrate/20180503131624_create_remote_mirrors.rb @@ -14,9 +14,9 @@ class CreateRemoteMirrors < ActiveRecord::Migration[4.2] t.string :url t.boolean :enabled, default: true t.string :update_status - t.datetime :last_update_at - t.datetime :last_successful_update_at - t.datetime :last_update_started_at + t.datetime :last_update_at # rubocop:disable Migration/Datetime + t.datetime :last_successful_update_at # rubocop:disable Migration/Datetime + t.datetime :last_update_started_at # rubocop:disable Migration/Datetime t.string :last_error t.boolean :only_protected_branches, default: false, null: false t.string :remote_name diff --git a/db/migrate/20200215225103_drop_forked_project_links_table.rb b/db/migrate/20200215225103_drop_forked_project_links_table.rb index f8dbd19980e..9c028d23dbc 100644 --- a/db/migrate/20200215225103_drop_forked_project_links_table.rb +++ b/db/migrate/20200215225103_drop_forked_project_links_table.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +# rubocop:disable Migration/Datetime + class DropForkedProjectLinksTable < ActiveRecord::Migration[6.0] include Gitlab::Database::MigrationHelpers |