From 9671a67a4ce58683ca0188ff9e75b1d5dfcc5dec Mon Sep 17 00:00:00 2001 From: Felipe Artur Date: Thu, 14 Feb 2019 16:33:26 -0200 Subject: Fix broken specs --- app/models/merge_request.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/merge_request.rb') 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? -- cgit v1.2.1