diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-10-04 10:17:43 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-10-04 10:17:43 +0000 |
| commit | 5d2b319de5180a6157d75c62c89e3ede71681f37 (patch) | |
| tree | e6cb4cc54514e8d11c6b4e2bc56979c080090d97 /db | |
| parent | 8ec0eda9cca95b7a8fd352e9cf38982ab177cfce (diff) | |
| parent | 869d8e814e4fcc4809dada1e2b34d4993461bda5 (diff) | |
| download | gitlab-ce-5d2b319de5180a6157d75c62c89e3ede71681f37.tar.gz | |
Merge branch 'fix-todo-cops' into 'master'
Fix todo cops
See merge request gitlab-org/gitlab-ce!21850
Diffstat (limited to 'db')
3 files changed, 1 insertions, 5 deletions
diff --git a/db/migrate/20170506185517_add_foreign_key_pipeline_schedules_and_pipelines.rb b/db/migrate/20170506185517_add_foreign_key_pipeline_schedules_and_pipelines.rb index 55bf40ba24d..cc5cb355579 100644 --- a/db/migrate/20170506185517_add_foreign_key_pipeline_schedules_and_pipelines.rb +++ b/db/migrate/20170506185517_add_foreign_key_pipeline_schedules_and_pipelines.rb @@ -13,7 +13,7 @@ class AddForeignKeyPipelineSchedulesAndPipelines < ActiveRecord::Migration 'SET NULL' end - add_concurrent_foreign_key :ci_pipelines, :ci_pipeline_schedules, + add_concurrent_foreign_key :ci_pipelines, :ci_pipeline_schedules, column: :pipeline_schedule_id, on_delete: on_delete end diff --git a/db/post_migrate/20161221153951_rename_reserved_project_names.rb b/db/post_migrate/20161221153951_rename_reserved_project_names.rb index 017c58477ac..08d7f499eec 100644 --- a/db/post_migrate/20161221153951_rename_reserved_project_names.rb +++ b/db/post_migrate/20161221153951_rename_reserved_project_names.rb @@ -1,5 +1,3 @@ -require 'thread' - class RenameReservedProjectNames < ActiveRecord::Migration include Gitlab::Database::MigrationHelpers include Gitlab::ShellAdapter diff --git a/db/post_migrate/20170313133418_rename_more_reserved_project_names.rb b/db/post_migrate/20170313133418_rename_more_reserved_project_names.rb index 3e8ccfdb899..43a37667250 100644 --- a/db/post_migrate/20170313133418_rename_more_reserved_project_names.rb +++ b/db/post_migrate/20170313133418_rename_more_reserved_project_names.rb @@ -1,5 +1,3 @@ -require 'thread' - class RenameMoreReservedProjectNames < ActiveRecord::Migration include Gitlab::Database::MigrationHelpers include Gitlab::ShellAdapter |