diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 18:09:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 18:09:01 +0300 |
commit | b304a72312465ed4c0a568ee6a6ea5e97f705c9b (patch) | |
tree | a2f25dbea26c81e88b169c55a6275e3969323e82 /db | |
parent | b84eeb256c4a780d902faee1f99ca9a711b3214a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
3 files changed, 33 insertions, 1 deletions
diff --git a/db/post_migrate/20200213220159_migrate_store_security_reports_sidekiq_queue.rb b/db/post_migrate/20200213220159_migrate_store_security_reports_sidekiq_queue.rb new file mode 100644 index 00000000000..5bba4c95328 --- /dev/null +++ b/db/post_migrate/20200213220159_migrate_store_security_reports_sidekiq_queue.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class MigrateStoreSecurityReportsSidekiqQueue < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def up + sidekiq_queue_migrate 'pipeline_default:store_security_reports', to: 'security_scans:store_security_reports' + end + + def down + sidekiq_queue_migrate 'security_scans:store_security_reports', to: 'pipeline_default:store_security_reports' + end +end diff --git a/db/post_migrate/20200213220211_migrate_sync_security_reports_to_report_approval_rules_sidekiq_queue.rb b/db/post_migrate/20200213220211_migrate_sync_security_reports_to_report_approval_rules_sidekiq_queue.rb new file mode 100644 index 00000000000..e3ed4c60f21 --- /dev/null +++ b/db/post_migrate/20200213220211_migrate_sync_security_reports_to_report_approval_rules_sidekiq_queue.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +class MigrateSyncSecurityReportsToReportApprovalRulesSidekiqQueue < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def up + sidekiq_queue_migrate 'pipeline_default:sync_security_reports_to_report_approval_rules', + to: 'security_scans:sync_security_reports_to_report_approval_rules' + end + + def down + sidekiq_queue_migrate 'security_scans:sync_security_reports_to_report_approval_rules', + to: 'pipeline_default:sync_security_reports_to_report_approval_rules' + end +end diff --git a/db/schema.rb b/db/schema.rb index 8836ace2312..0259c63d3e5 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_02_13_204737) do +ActiveRecord::Schema.define(version: 2020_02_13_220211) do # These are extensions that must be enabled in order to support this database enable_extension "pg_trgm" |