diff options
| author | Josh Frye <joshfng@gmail.com> | 2016-01-28 08:48:46 -0500 |
|---|---|---|
| committer | Josh Frye <joshfng@gmail.com> | 2016-01-29 09:23:24 -0500 |
| commit | f255313ea47b433b428b3b90452aede8c9a6618c (patch) | |
| tree | 411493ed9b7addb40d8682eaabb105a88873de35 | |
| parent | 91b9cbff8de538c2966bca94c517ee6aa346f79b (diff) | |
| download | gitlab-ce-background-delete-process.tar.gz | |
Update CHANGELOGbackground-delete-process
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | db/migrate/20160122185421_add_pending_delete_to_project.rb | 2 | ||||
| -rw-r--r-- | db/schema.rb | 8 |
3 files changed, 6 insertions, 8 deletions
diff --git a/CHANGELOG b/CHANGELOG index 8a6a4042cb0..66ca75e70da 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,8 +1,5 @@ Please view this file on the master branch, on stable branches it's out of date. -v 8.6.0 (unreleased) - - Delete project and associations in a background worker - v 8.5.0 (unreleased) - Ensure rake tasks that don't need a DB connection can be run without one - Add "visibility" flag to GET /projects api endpoint @@ -41,6 +38,7 @@ v 8.4.1 and Nokogiri (1.6.7.2) - Fix redirect loop during import - Fix diff highlighting for all syntax themes + - Delete project and associations in a background worker v 8.4.0 - Allow LDAP users to change their email if it was not set by the LDAP server diff --git a/db/migrate/20160122185421_add_pending_delete_to_project.rb b/db/migrate/20160122185421_add_pending_delete_to_project.rb index 457922942b0..046a5d8fc32 100644 --- a/db/migrate/20160122185421_add_pending_delete_to_project.rb +++ b/db/migrate/20160122185421_add_pending_delete_to_project.rb @@ -1,5 +1,5 @@ class AddPendingDeleteToProject < ActiveRecord::Migration def change - add_column :projects, :pending_delete, :boolean + add_column :projects, :pending_delete, :boolean, default: false end end diff --git a/db/schema.rb b/db/schema.rb index 8c9cbe73c87..73589cb1f17 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -677,7 +677,7 @@ ActiveRecord::Schema.define(version: 20160128212447) 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" + 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 @@ -729,9 +729,9 @@ ActiveRecord::Schema.define(version: 20160128212447) do t.string "type" t.string "title" t.integer "project_id" - t.datetime "created_at" - t.datetime "updated_at" - t.boolean "active", default: false, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.boolean "active", null: false t.text "properties" t.boolean "template", default: false t.boolean "push_events", default: true |