diff options
| author | Felipe Artur <felipefac@gmail.com> | 2019-02-14 16:33:26 -0200 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2019-02-14 16:33:26 -0200 |
| commit | 9671a67a4ce58683ca0188ff9e75b1d5dfcc5dec (patch) | |
| tree | 67f4d0852510e80ad8b7b08fca7b7ec14dda646b /app/models/merge_request.rb | |
| parent | d4a5d8d07069acb6f068990633baaf56d20bc18b (diff) | |
| download | gitlab-ce-9671a67a4ce58683ca0188ff9e75b1d5dfcc5dec.tar.gz | |
Fix broken specs
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 0ec0789a24f..063433111cc 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(merged: 3, locked: 4) + @available_states ||= super.merge(merged: 3, locked: 4) end def rebase_in_progress? |