Download as
Browse Code »

Commit 55fbe71ad11640347be8128d3c26a33b934e30a8

Authored by Daniel Cestari
Committed by Dmitriy Zaporozhets
1 parent a599d812
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

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)
Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
app/models/merge_request.rb
  Diff comments   View file @55fbe71
@@ -133,7 +133,7 @@ class MergeRequest < ActiveRecord::Base @@ -133,7 +133,7 @@ class MergeRequest < ActiveRecord::Base
133 end 133 end
134 134
135 def reload_code 135 def reload_code
136 - if merge_request_diff && opened? 136 + if merge_request_diff && open?
137 merge_request_diff.reload_content 137 merge_request_diff.reload_content
138 end 138 end
139 end 139 end