diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-07-31 19:01:36 -0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-08-07 15:23:37 -0300 |
| commit | 0640b3d1d89b7a4eda343eb23b0518a835ac9106 (patch) | |
| tree | 13970b43017ada593f08b70ca713dc19a1f064cf /db/schema.rb | |
| parent | b12107a0b953b566cd58db30ae880800a4a695a6 (diff) | |
| download | gitlab-ce-0640b3d1d89b7a4eda343eb23b0518a835ac9106.tar.gz | |
Store MergeWorker JID on merge request, and clean up stuck merges
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/db/schema.rb b/db/schema.rb index f2f35acef95..4816e1aefab 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -840,7 +840,6 @@ ActiveRecord::Schema.define(version: 20170803130232) do t.integer "target_project_id", null: false t.integer "iid" t.text "description" - t.datetime "locked_at" t.integer "updated_by_id" t.text "merge_error" t.text "merge_params" @@ -858,6 +857,7 @@ ActiveRecord::Schema.define(version: 20170803130232) do t.integer "last_edited_by_id" t.integer "head_pipeline_id" t.boolean "ref_fetched" + t.string "merge_jid" end add_index "merge_requests", ["assignee_id"], name: "index_merge_requests_on_assignee_id", using: :btree |