summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2019-02-11 15:48:37 -0200
committerFelipe Artur <felipefac@gmail.com>2019-02-11 15:48:40 -0200
commite9b84f50e961ee7c3abfb8192de8f4fc778df041 (patch)
tree7035d6ea15eb0e2ffbda561d4915c9597c6492a1 /app/models/merge_request.rb
parentef875bd7aa24fd2c68027b8d6c837f33642a606e (diff)
downloadgitlab-ce-e9b84f50e961ee7c3abfb8192de8f4fc778df041.tar.gz
Migrate issuable states to integer patch 1
Patch 1 that migrates issues/merge requests states from integer to string. On this commit we are only adding the state_id column and syncing it with a backgroud migration. On Patch 2 the code to use the new integer column will be deployed and the old column will be removed.
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 2035bffd829..67600383cf9 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -22,6 +22,8 @@ class MergeRequest < ActiveRecord::Base
self.reactive_cache_lifetime = 10.minutes
SORTING_PREFERENCE_FIELD = :merge_requests_sort
+ MERGE_REQUEST_STATES =
+ AVAILABLE_STATES = AVAILABLE_STATES.merge(merged: 3, locked: 4).freeze
ignore_column :locked_at,
:ref_fetched,