diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-15 11:56:59 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-15 11:56:59 +0000 |
| commit | d6ba5530b55a32137f14760e59b991ae900d2f53 (patch) | |
| tree | 20487fcc095a75f306ab4bc06b7a3446a78b6954 /db | |
| parent | 743cde02c37490396f9c5d2822406ce66190c751 (diff) | |
| parent | 20ece0aac37ab38c6207bd3d0a4c6276275fb049 (diff) | |
| download | gitlab-ce-d6ba5530b55a32137f14760e59b991ae900d2f53.tar.gz | |
Merge branch 'enable-auto-cancelling-by-default' into 'master'
Make auto-cancelling pending pipelines on by default
Closes #30656
See merge request !11023
Diffstat (limited to 'db')
3 files changed, 29 insertions, 1 deletions
diff --git a/db/migrate/20170502065653_make_auto_cancel_pending_pipelines_on_by_default.rb b/db/migrate/20170502065653_make_auto_cancel_pending_pipelines_on_by_default.rb new file mode 100644 index 00000000000..03bf626a08a --- /dev/null +++ b/db/migrate/20170502065653_make_auto_cancel_pending_pipelines_on_by_default.rb @@ -0,0 +1,13 @@ +class MakeAutoCancelPendingPipelinesOnByDefault < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def up + change_column_default(:projects, :auto_cancel_pending_pipelines, 1) + end + + def down + change_column_default(:projects, :auto_cancel_pending_pipelines, 0) + end +end diff --git a/db/post_migrate/20170502070007_enable_auto_cancel_pending_pipelines_for_all.rb b/db/post_migrate/20170502070007_enable_auto_cancel_pending_pipelines_for_all.rb new file mode 100644 index 00000000000..a19b73fc114 --- /dev/null +++ b/db/post_migrate/20170502070007_enable_auto_cancel_pending_pipelines_for_all.rb @@ -0,0 +1,15 @@ +class EnableAutoCancelPendingPipelinesForAll < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + disable_ddl_transaction! + + DOWNTIME = false + + def up + update_column_in_batches(:projects, :auto_cancel_pending_pipelines, 1) + end + + def down + # Nothing we can do! + end +end diff --git a/db/schema.rb b/db/schema.rb index 4aaf3642173..a683521c84b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -988,7 +988,7 @@ ActiveRecord::Schema.define(version: 20170508190732) do t.text "description_html" t.boolean "only_allow_merge_if_all_discussions_are_resolved" t.boolean "printing_merge_request_link_enabled", default: true, null: false - t.integer "auto_cancel_pending_pipelines", default: 0, null: false + t.integer "auto_cancel_pending_pipelines", default: 1, null: false t.string "import_jid" t.integer "cached_markdown_version" t.datetime "last_repository_updated_at" |