diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-12 06:51:26 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-12 06:51:26 +0000 |
| commit | 83eb5f32531b25cefa2e8541b6735a2810a52481 (patch) | |
| tree | 0e5f928e876d887adf7b234a67d505625b5775ba | |
| parent | ad5e5b5cfa5eae211aa6ad29e677d75b57a20a99 (diff) | |
| parent | 36a3ea5d726f89a18b08a67e21455540bc2a5aa8 (diff) | |
| download | gitlab-ce-6-6-stable.tar.gz | |
Merge branch 'topic/fix_mr_reload_error' into '6-6-stable'6-6-stable
Fix reopened merge request's code reload
| -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 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 |