diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-08-25 21:38:16 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-08-25 21:38:16 +0000 |
| commit | 5640cbe6ba11dc185e2fd4a9ab764ee0f5c9ae52 (patch) | |
| tree | 1d6de850acb7a9549f398aa97a51c6fb6babff25 | |
| parent | 3ab40c5108781fdb4012e0b993aa6a28a8cc8194 (diff) | |
| parent | 7b4b4a0e557459fef2ef34361f5c231274006ab7 (diff) | |
| download | gitlab-ce-5640cbe6ba11dc185e2fd4a9ab764ee0f5c9ae52.tar.gz | |
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
| -rw-r--r-- | db/schema.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/db/schema.rb b/db/schema.rb index 38779065225..5a105a91ad1 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -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 |