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

Merge branch 'add-lock-version-to-mr-schema' into 'master'
5640cbe6 · Stan Hu · 3ab40c51 · 7b4b4a0e · 5640cbe6
Commit 5640cbe6 authored Aug 25, 2016 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

schema.rb db/schema.rb +1 -0

No files found.
--- 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