diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-16 12:07:35 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-16 12:07:35 +0000 |
| commit | be353219d1eec05a7b04e9c2e94f61573889549d (patch) | |
| tree | e5f454922a4cab9191e8200fc8781c6aef220917 /app/controllers/projects | |
| parent | 7a9c32648ef6d312f869d707b183e51db1308cad (diff) | |
| parent | ca4a59e3df2a8cd64c4055528dde9cb8dd58a369 (diff) | |
| download | gitlab-ce-be353219d1eec05a7b04e9c2e94f61573889549d.tar.gz | |
Merge branch 'issue_41460' into 'master'
Fix error on changes tab when merge request cannot be created
Closes #41460
See merge request gitlab-org/gitlab-ce!16409
Diffstat (limited to 'app/controllers/projects')
| -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 |