diff options
| author | Felipe Artur <felipefac@gmail.com> | 2019-02-14 11:48:20 -0200 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2019-02-14 11:48:20 -0200 |
| commit | 37741c59a4daf1b0d6d9f7a6a51337e9d8effb66 (patch) | |
| tree | 4a4bc367617a4ad4e106ddeffeecf1cb013ad5e4 /app/models/merge_request.rb | |
| parent | 26f40aefb09b96538fa99f74d46542ad39bb1679 (diff) | |
| download | gitlab-ce-37741c59a4daf1b0d6d9f7a6a51337e9d8effb66.tar.gz | |
Split background migration for issues and merge requests
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 6baf479d8d1..0ec0789a24f 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -194,7 +194,7 @@ class MergeRequest < ActiveRecord::Base end def self.available_states - @states ||= super.merge(locked: 3, merged: 4) + @states ||= super.merge(merged: 3, locked: 4) end def rebase_in_progress? |