diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-01 06:12:22 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-01 06:12:22 +0000 |
commit | 712bbb451d1cb52dc6fac04ac0e13feeaaa765bf (patch) | |
tree | 7b919f3c9dd75fabba03674a492a69f956acdcee /app/views/projects/merge_requests | |
parent | b0ad241fbbdf6a9d4ccb6f44f2c233d542b3b08d (diff) | |
download | gitlab-ce-712bbb451d1cb52dc6fac04ac0e13feeaaa765bf.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/merge_requests')
-rw-r--r-- | app/views/projects/merge_requests/_page.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_page.html.haml b/app/views/projects/merge_requests/_page.html.haml index 47760211bd5..83b56d81a45 100644 --- a/app/views/projects/merge_requests/_page.html.haml +++ b/app/views/projects/merge_requests/_page.html.haml @@ -90,7 +90,7 @@ = render "projects/merge_requests/tabs/pane", name: "pipelines", id: "pipelines", class: "pipelines" do - if @project.builds_enabled? = render 'projects/commit/pipelines_list', disable_initialization: true, endpoint: pipelines_project_merge_request_path(@project, @merge_request) - - params = request.query_parameters.merge(diff_head: true) + - params = request.query_parameters.merge(ck: @diffs_batch_cache_key, diff_head: true) = render "projects/merge_requests/tabs/pane", name: "diffs", id: "js-diffs-app", class: "diffs", data: diffs_tab_pane_data(@project, @merge_request, params) .mr-loading-status |