Commit 5640cbe6 authored by Stan Hu's avatar Stan Hu

Merge branch 'add-lock-version-to-mr-schema' into 'master'

Add lock_version to merge_requests table

Add lock_version to merge_requests table

Closes #21465

It appears this column was mistakenly omitted in !5623 due to rebasing
issues in earlier comments.

See merge request !6037
parents 3ab40c51 7b4b4a0e
......@@ -620,6 +620,7 @@ ActiveRecord::Schema.define(version: 20160823081327) do
t.string "merge_commit_sha"
t.datetime "deleted_at"
t.string "in_progress_merge_commit_sha"
t.integer "lock_version"
end
add_index "merge_requests", ["assignee_id"], name: "index_merge_requests_on_assignee_id", using: :btree
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment