diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-14 13:38:57 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-14 13:38:57 +0000 |
| commit | 10e18de60f55811137871acefd331d2d5a41f237 (patch) | |
| tree | b227511752fb7021acec83fd3b2b5499434ae7f8 /app/controllers/projects | |
| parent | 757327a59bcaecb986b0c07ae0cf09ed011e18ce (diff) | |
| download | gitlab-ce-10e18de60f55811137871acefd331d2d5a41f237.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-12-stable-ee
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/merge_requests/diffs_controller.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests/diffs_controller.rb b/app/controllers/projects/merge_requests/diffs_controller.rb index 3eaabfbf33e..f125952cb97 100644 --- a/app/controllers/projects/merge_requests/diffs_controller.rb +++ b/app/controllers/projects/merge_requests/diffs_controller.rb @@ -163,7 +163,10 @@ class Projects::MergeRequests::DiffsController < Projects::MergeRequests::Applic end def render_merge_ref_head_diff? - Gitlab::Utils.to_boolean(params[:diff_head]) && @merge_request.diffable_merge_ref? && @start_sha.nil? + params[:diff_id].blank? && + Gitlab::Utils.to_boolean(params[:diff_head]) && + @merge_request.diffable_merge_ref? && + @start_sha.nil? end def note_positions |