From 36a3ea5d726f89a18b08a67e21455540bc2a5aa8 Mon Sep 17 00:00:00 2001 From: Daniel Cestari Date: Tue, 11 Mar 2014 17:20:02 -0430 Subject: Fix error with reopened merge request not properly reloading If you reopen a Merge Request and then try to update the source branch it won't properly reload the code since the "reload_code" method still checks if the MR is "opened" and not just "open" (which includes reopened) --- app/models/merge_request.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 4774cbcf3aa..7c2648d8c7a 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -133,7 +133,7 @@ class MergeRequest < ActiveRecord::Base end def reload_code - if merge_request_diff && opened? + if merge_request_diff && open? merge_request_diff.reload_content end end -- cgit v1.2.3