diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2016-07-18 18:51:59 +0530 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2016-07-18 18:51:59 +0530 |
| commit | de1fa5010f705927ac5f5c01ce9595d3c52d44ef (patch) | |
| tree | afb01e3e31113eddc71a624057a7aef5e6db6631 | |
| parent | 2cf7f09b1e9ccb000433374a42bd7b33b73f8116 (diff) | |
| download | gitlab-ce-undo-revert-of-4892.tar.gz | |
Remove `lock_version` from the `merge_requests` table.undo-revert-of-4892
- This was introduced (at some point) while rebasing `master` against
the "developers can merge" feature branch.
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5310#note_13139705
| -rw-r--r-- | db/schema.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/db/schema.rb b/db/schema.rb index 453a8fb9e51..6e2f089d426 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -624,7 +624,6 @@ ActiveRecord::Schema.define(version: 20160712171823) do t.integer "merge_user_id" 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 |