diff options
Diffstat (limited to 'app/helpers/merge_requests_helper.rb')
-rw-r--r-- | app/helpers/merge_requests_helper.rb | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 7a798c83b7e..df7fcb0f3da 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -176,13 +176,39 @@ module MergeRequestsHelper def reviewers_label(merge_request, include_value: true) reviewers = merge_request.reviewers - reviewer_label = 'Reviewer'.pluralize(reviewers.count) if include_value sanitized_list = sanitize_name(reviewers.map(&:name).to_sentence) - "#{reviewer_label}: #{sanitized_list}" + ns_('NotificationEmail|Reviewer: %{users}', 'NotificationEmail|Reviewers: %{users}', reviewers.count) % { users: sanitized_list } else - reviewer_label + ns_('NotificationEmail|Reviewer', 'NotificationEmail|Reviewers', reviewers.count) + 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 + + def award_emoji_merge_request_api_path(merge_request) + if Feature.enabled?(:improved_emoji_picker, merge_request.project, default_enabled: :yaml) + api_v4_projects_merge_requests_award_emoji_path(id: merge_request.project.id, merge_request_iid: merge_request.iid) end end |