diff options
| author | Felipe Artur <felipefac@gmail.com> | 2018-01-11 23:18:01 +0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2018-01-15 16:53:40 +0300 |
| commit | ca4a59e3df2a8cd64c4055528dde9cb8dd58a369 (patch) | |
| tree | ed3ea6228c8bf17cf1197dedba31feb3dcd7c849 /app/controllers/projects/merge_requests | |
| parent | 34760245bcb4156e21ca463b82b1fab84508b842 (diff) | |
Fix error on changes tab when merge request cannot be created
Diffstat (limited to 'app/controllers/projects/merge_requests')
| -rw-r--r-- | app/controllers/projects/merge_requests/creations_controller.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/controllers/projects/merge_requests/creations_controller.rb b/app/controllers/projects/merge_requests/creations_controller.rb index 3d2926d5d75..0df80fa700f 100644 --- a/app/controllers/projects/merge_requests/creations_controller.rb +++ b/app/controllers/projects/merge_requests/creations_controller.rb @@ -43,11 +43,7 @@ class Projects::MergeRequests::CreationsController < Projects::MergeRequests::Ap end def diffs - @diffs = if @merge_request.can_be_created - @merge_request.diffs(diff_options) - else - [] - end + @diffs = @merge_request.diffs(diff_options) if @merge_request.can_be_created @diff_notes_disabled = true |