diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-04-02 11:39:53 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-04-02 11:39:53 +0300 |
| commit | f87b7fe3b386962c45e83486634352da544857fb (patch) | |
| tree | 4c3fc969e0306e9877d22f787e8064126bfdef75 /app/models/merge_request.rb | |
| parent | 5ddd4f0f0708921ca0c8a9a941cfb4c0fb868b00 (diff) | |
| parent | f2b7da4bf507691cffd419d3dd759fcf6311cdd6 (diff) | |
Merge branch 'issue_51789_part_1' into 'master'
Migrate issuable states to integer patch 1 of 2
Closes #51789
See merge request gitlab-org/gitlab-ce!25107
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index f6b83453c2a..50e6391a700 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -210,6 +210,10 @@ class MergeRequest < ApplicationRecord '!' end + def self.available_states + @available_states ||= super.merge(merged: 3, locked: 4) + end + # Returns the top 100 target branches # # The returned value is a Array containing branch names |