diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-30 12:14:48 +0100 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-30 12:14:48 +0100 |
commit | f862b4ae0faee80344faa583c74389c8e57fb7c2 (patch) | |
tree | 60fba79f2e2ca0c96a23ba0495a5cd04a42a0d19 /db | |
parent | 3d61cf9f1bfaa9d0ffd5cc36e54162c0f0b59c61 (diff) | |
parent | f255313ea47b433b428b3b90452aede8c9a6618c (diff) | |
download | gitlab-ce-f862b4ae0faee80344faa583c74389c8e57fb7c2.tar.gz |
Merge remote-tracking branch 'origin/background-delete-process'
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20160122185421_add_pending_delete_to_project.rb | 5 | ||||
-rw-r--r-- | db/schema.rb | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/db/migrate/20160122185421_add_pending_delete_to_project.rb b/db/migrate/20160122185421_add_pending_delete_to_project.rb new file mode 100644 index 00000000000..046a5d8fc32 --- /dev/null +++ b/db/migrate/20160122185421_add_pending_delete_to_project.rb @@ -0,0 +1,5 @@ +class AddPendingDeleteToProject < ActiveRecord::Migration + def change + add_column :projects, :pending_delete, :boolean, default: false + end +end diff --git a/db/schema.rb b/db/schema.rb index 96b5c3af1e5..2ad2c23fba5 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -677,6 +677,7 @@ ActiveRecord::Schema.define(version: 20160128233227) do t.string "build_coverage_regex" t.boolean "build_allow_git_fetch", default: true, null: false t.integer "build_timeout", default: 3600, null: false + t.boolean "pending_delete", default: false end add_index "projects", ["builds_enabled", "shared_runners_enabled"], name: "index_projects_on_builds_enabled_and_shared_runners_enabled", using: :btree |