summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb4
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