From c1f41a0f87b67063539f6aa60cd19809dba0b1cf Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 19 Feb 2015 10:27:06 -0800 Subject: [PATCH] Revert "Change the default value of rebase on merge request to false." This reverts commit 1b55e48ed1a0c4962773508db7dd27e9aee36351. --- .../20150217001826_change_rebase_project_setting_to_false.rb | 5 ----- db/schema.rb | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 db/migrate/20150217001826_change_rebase_project_setting_to_false.rb diff --git a/db/migrate/20150217001826_change_rebase_project_setting_to_false.rb b/db/migrate/20150217001826_change_rebase_project_setting_to_false.rb deleted file mode 100644 index 2f0e082844..0000000000 --- a/db/migrate/20150217001826_change_rebase_project_setting_to_false.rb +++ /dev/null @@ -1,5 +0,0 @@ -class ChangeRebaseProjectSettingToFalse < ActiveRecord::Migration - def change - change_column :projects, :merge_requests_rebase_default, :boolean, default: false - end -end diff --git a/db/schema.rb b/db/schema.rb index 988ec7cdec..67039ea36c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20150217001826) do +ActiveRecord::Schema.define(version: 20150213121042) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -398,7 +398,7 @@ ActiveRecord::Schema.define(version: 20150217001826) do t.boolean "merge_requests_rebase_enabled", default: false t.string "import_type" t.string "import_source" - t.boolean "merge_requests_rebase_default", default: false + t.boolean "merge_requests_rebase_default", default: true end add_index "projects", ["created_at", "id"], name: "index_projects_on_created_at_and_id", using: :btree