From 4d6582cc54cc317bc31cc8dc2339668bb7550ced Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sat, 3 Apr 2021 00:09:02 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/helpers/merge_requests_helper.rb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'app/helpers/merge_requests_helper.rb') diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 376dde9d612..ecb5a7a9071 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -185,6 +185,27 @@ module MergeRequestsHelper end end + def diffs_tab_pane_data(project, merge_request, params) + { + "is-locked": merge_request.discussion_locked?, + endpoint: diffs_project_merge_request_path(project, merge_request, 'json', params), + endpoint_metadata: @endpoint_metadata_url, + endpoint_batch: diffs_batch_project_json_merge_request_path(project, merge_request, 'json', params), + endpoint_coverage: @coverage_path, + help_page_path: help_page_path('user/discussions/index.md', anchor: 'suggest-changes'), + current_user_data: @current_user_data, + update_current_user_path: @update_current_user_path, + project_path: project_path(merge_request.project), + changes_empty_state_illustration: image_path('illustrations/merge_request_changes_empty.svg'), + is_fluid_layout: fluid_layout.to_s, + dismiss_endpoint: user_callouts_path, + show_suggest_popover: show_suggest_popover?.to_s, + show_whitespace_default: @show_whitespace_default.to_s, + file_by_file_default: @file_by_file_default.to_s, + default_suggestion_commit_message: default_suggestion_commit_message + } + end + private def review_requested_merge_requests_count -- cgit v1.2.3