diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-21 00:07:30 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-21 00:07:30 +0300 |
commit | 5d7e5a8902382caaffa616e1b496b684ba72d148 (patch) | |
tree | 30d755b056cdd521071b0b23ce8c5823ad18e355 /app/views/projects/merge_requests | |
parent | cc4e1c884cd6b8782fb6a247d840a2d1c7f4603e (diff) |
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 47eb3e016d3..c609c84d336 100644 --- a/app/views/projects/merge_requests/_page.html.haml +++ b/app/views/projects/merge_requests/_page.html.haml @@ -19,7 +19,7 @@ - if mr_action == 'diffs' - add_page_startup_api_call @endpoint_diff_batch_url -.merge-request{ data: { mr_action: mr_action, url: merge_request_path(@merge_request, format: :json), project_path: project_path(@merge_request.project), lock_version: @merge_request.lock_version } } +.merge-request{ data: { mr_action: mr_action, url: merge_request_path(@merge_request, format: :json), project_path: project_path(@merge_request.project), lock_version: @merge_request.lock_version, diffs_batch_cache_key: @diffs_batch_cache_key } } - if moved_mr_sidebar_enabled? #js-merge-sticky-header{ data: { data: sticky_header_data.to_json } } = render "projects/merge_requests/mr_title" |