From 530f5158e297f3cde27f3566cfe13bad74ba3b50 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Wed, 13 Jul 2016 13:57:30 -0500 Subject: Revert "Merge branch '18193-developers-can-merge' into 'master' " This reverts commit 9ca633eb4c62231e4ddff5466c723cf8e2bdb25d, reversing changes made to fb229bbf7970ba908962b837b270adf56f14098f. --- ...60519203051_add_developers_can_merge_to_protected_branches.rb | 9 --------- ..._add_column_in_progress_merge_commit_sha_to_merge_requests.rb | 8 -------- db/schema.rb | 8 +++----- 3 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 db/migrate/20160519203051_add_developers_can_merge_to_protected_branches.rb delete mode 100644 db/migrate/20160629025435_add_column_in_progress_merge_commit_sha_to_merge_requests.rb (limited to 'db') diff --git a/db/migrate/20160519203051_add_developers_can_merge_to_protected_branches.rb b/db/migrate/20160519203051_add_developers_can_merge_to_protected_branches.rb deleted file mode 100644 index 15ad8e8bcbb..00000000000 --- a/db/migrate/20160519203051_add_developers_can_merge_to_protected_branches.rb +++ /dev/null @@ -1,9 +0,0 @@ -class AddDevelopersCanMergeToProtectedBranches < ActiveRecord::Migration - include Gitlab::Database::MigrationHelpers - - disable_ddl_transaction! - - def change - add_column_with_default :protected_branches, :developers_can_merge, :boolean, default: false, allow_null: false - end -end diff --git a/db/migrate/20160629025435_add_column_in_progress_merge_commit_sha_to_merge_requests.rb b/db/migrate/20160629025435_add_column_in_progress_merge_commit_sha_to_merge_requests.rb deleted file mode 100644 index 7c5f76572ef..00000000000 --- a/db/migrate/20160629025435_add_column_in_progress_merge_commit_sha_to_merge_requests.rb +++ /dev/null @@ -1,8 +0,0 @@ -# See http://doc.gitlab.com/ce/development/migration_style_guide.html -# for more information on how to write migrations for GitLab. - -class AddColumnInProgressMergeCommitShaToMergeRequests < ActiveRecord::Migration - def change - add_column :merge_requests, :in_progress_merge_commit_sha, :string - end -end diff --git a/db/schema.rb b/db/schema.rb index 64019cf79bb..f24e47b85b2 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -626,7 +626,6 @@ ActiveRecord::Schema.define(version: 20160712171823) do t.string "merge_commit_sha" t.datetime "deleted_at" t.integer "lock_version", default: 0, null: false - t.string "in_progress_merge_commit_sha" end add_index "merge_requests", ["assignee_id"], name: "index_merge_requests_on_assignee_id", using: :btree @@ -861,12 +860,11 @@ ActiveRecord::Schema.define(version: 20160712171823) do add_index "projects", ["visibility_level"], name: "index_projects_on_visibility_level", using: :btree create_table "protected_branches", force: :cascade do |t| - t.integer "project_id", null: false - t.string "name", null: false + t.integer "project_id", null: false + t.string "name", null: false t.datetime "created_at" t.datetime "updated_at" - t.boolean "developers_can_push", default: false, null: false - t.boolean "developers_can_merge", default: false, null: false + t.boolean "developers_can_push", default: false, null: false end add_index "protected_branches", ["project_id"], name: "index_protected_branches_on_project_id", using: :btree -- cgit v1.2.1