diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml index 146522c5e764020da50b0c5938a0f320f90257f3..75b7808e17e5cd03883e74e4936ed4febc581d35 100644 --- a/.rubocop_todo/layout/argument_alignment.yml +++ b/.rubocop_todo/layout/argument_alignment.yml @@ -514,23 +514,6 @@ Layout/ArgumentAlignment: - 'app/graphql/types/work_items/widgets/start_and_due_date_update_input_type.rb' - 'app/graphql/types/x509_certificate_type.rb' - 'app/graphql/types/x509_issuer_type.rb' - - 'app/helpers/application_helper.rb' - - 'app/helpers/application_settings_helper.rb' - - 'app/helpers/blob_helper.rb' - - 'app/helpers/ci/status_helper.rb' - - 'app/helpers/commits_helper.rb' - - 'app/helpers/dashboard_helper.rb' - - 'app/helpers/events_helper.rb' - - 'app/helpers/feature_flags_helper.rb' - - 'app/helpers/issuables_helper.rb' - - 'app/helpers/mirror_helper.rb' - - 'app/helpers/notes_helper.rb' - - 'app/helpers/projects/error_tracking_helper.rb' - - 'app/helpers/snippets_helper.rb' - - 'app/helpers/todos_helper.rb' - - 'app/helpers/users/group_callouts_helper.rb' - - 'app/helpers/users_helper.rb' - - 'app/helpers/visibility_level_helper.rb' - 'app/mailers/emails/projects.rb' - 'app/mailers/notify.rb' - 'app/models/abuse_report.rb' @@ -1182,9 +1165,6 @@ Layout/ArgumentAlignment: - 'ee/app/graphql/types/work_items/widgets/status_filter_input_type.rb' - 'ee/app/graphql/types/work_items/widgets/status_input_type.rb' - 'ee/app/graphql/types/work_items/widgets/weight_input_type.rb' - - 'ee/app/helpers/billing_plans_helper.rb' - - 'ee/app/helpers/ee/feature_flags_helper.rb' - - 'ee/app/helpers/ee/search_helper.rb' - 'ee/app/mailers/ee/emails/projects.rb' - 'ee/app/mailers/emails/namespace_storage_usage_mailer.rb' - 'ee/app/models/approval_wrapped_rule.rb' diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index d822a2978567685f406583758d8c1b97e5e3ddfa..d0602952f9af9fe4b927e00d07b8bfbda1aedcdb 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -181,14 +181,14 @@ def time_ago_with_tooltip(time, placement: 'top', html_class: '', short_format: css_classes << html_class unless html_class.blank? content_tag :time, l(time, format: "%b %d, %Y"), - class: css_classes.join(' '), - title: l(time.to_time.in_time_zone, format: :timeago_tooltip), - datetime: time.to_time.getutc.iso8601, - data: { - toggle: 'tooltip', - placement: placement, - container: 'body' - } + class: css_classes.join(' '), + title: l(time.to_time.in_time_zone, format: :timeago_tooltip), + datetime: time.to_time.getutc.iso8601, + data: { + toggle: 'tooltip', + placement: placement, + container: 'body' + } end def edited_time_ago_with_tooltip(object, placement: 'top', html_class: 'time_ago', exclude_author: false) diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index dd5f4f17ee236ddbe2ebacee0deeb9ed56e40b9b..fde3da77250d83bea02c583edd98857472be0335 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -4,11 +4,11 @@ module ApplicationSettingsHelper extend self delegate :allow_signup?, - :gravatar_enabled?, - :password_authentication_enabled_for_web?, - :akismet_enabled?, - :spam_check_endpoint_enabled?, - to: :'Gitlab::CurrentSettings.current_application_settings' + :gravatar_enabled?, + :password_authentication_enabled_for_web?, + :akismet_enabled?, + :spam_check_endpoint_enabled?, + to: :'Gitlab::CurrentSettings.current_application_settings' def user_oauth_applications? Gitlab::CurrentSettings.user_oauth_applications diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb index 281d5c923d0257b8a36f053b417a25e23d66dd8d..bb6fd6c3dad913ebdacbf34732b2c63d67afe30c 100644 --- a/app/helpers/blob_helper.rb +++ b/app/helpers/blob_helper.rb @@ -2,9 +2,7 @@ module BlobHelper def edit_blob_path(project = @project, ref = @ref, path = @path, options = {}) - project_edit_blob_path(project, - tree_join(ref, path), - options[:link_opts]) + project_edit_blob_path(project, tree_join(ref, path), options[:link_opts]) end def ide_edit_path(project = @project, ref = @ref, path = @path) @@ -52,9 +50,11 @@ def fork_and_edit_path(project = @project, ref = @ref, path = @path, options = { def fork_path_for_current_user(project, path, with_notice: true) return unless current_user - project_forks_path(project, - namespace_key: current_user.namespace&.id, - continue: edit_blob_fork_params(path, with_notice: with_notice)) + project_forks_path( + project, + namespace_key: current_user.namespace&.id, + continue: edit_blob_fork_params(path, with_notice: with_notice) + ) end def encode_ide_path(path) @@ -66,12 +66,14 @@ def edit_blob_button(project = @project, ref = @ref, path = @path, options = {}) common_classes = "btn gl-button btn-confirm js-edit-blob gl-ml-3 #{options[:extra_class]}" - edit_button_tag(blob, - common_classes, - _('Edit'), - edit_blob_path(project, ref, path, options), - project, - ref) + edit_button_tag( + blob, + common_classes, + _('Edit'), + edit_blob_path(project, ref, path, options), + project, + ref + ) end def can_modify_blob?(blob, project = @project, ref = @ref) @@ -282,8 +284,8 @@ def edit_fork_button_tag(common_classes, project, label, params, action = 'edit' fork_path = project_forks_path(project, namespace_key: current_user.namespace.id, continue: params) button_tag label, - class: "#{common_classes} js-edit-blob-link-fork-toggler", - data: { action: action, fork_path: fork_path } + class: "#{common_classes} js-edit-blob-link-fork-toggler", + data: { action: action, fork_path: fork_path } end def edit_disabled_button_tag(button_text, common_classes) diff --git a/app/helpers/ci/status_helper.rb b/app/helpers/ci/status_helper.rb index bca49324a1934ddb9ba2669c135a0c7d0474be90..ea5b613cb780631fe57f0894c02c0f953f8e44d7 100644 --- a/app/helpers/ci/status_helper.rb +++ b/app/helpers/ci/status_helper.rb @@ -131,10 +131,10 @@ def render_status_with_link(status, path = nil, type: _('pipeline'), tooltip_pla if path link_to ci_icon_for_status(status, size: icon_size), path, - class: klass, title: title, data: data + class: klass, title: title, data: data else content_tag :span, ci_icon_for_status(status, size: icon_size), - class: klass, title: title, data: data + class: klass, title: title, data: data end end diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb index f4893a833042a980a8bfb3c2455992c2b7974153..519508f1c0211fa102e2e0ab600632e635d8c802 100644 --- a/app/helpers/commits_helper.rb +++ b/app/helpers/commits_helper.rb @@ -27,12 +27,11 @@ def commit_committer_avatar(committer, options = {}) end def commit_to_html(commit, ref, project) - render partial: 'projects/commits/commit', formats: :html, - locals: { - commit: commit, - ref: ref, - project: project - } + render partial: 'projects/commits/commit', formats: :html, locals: { + commit: commit, + ref: ref, + project: project + } end # Breadcrumb links for a Project and, if applicable, a tree path @@ -194,10 +193,12 @@ def diff_mode_swap_button(mode, file_hash) entity = mode == 'raw' ? 'rawButton' : 'renderedButton' title = "Display #{mode} diff" - link_to("##{mode}-diff-#{file_hash}", - class: "btn gl-button btn-default btn-file-option has-tooltip btn-show-#{mode}-diff", - title: title, - data: { file_hash: file_hash, diff_toggle_entity: entity }) do + link_to( + "##{mode}-diff-#{file_hash}", + class: "btn gl-button btn-default btn-file-option has-tooltip btn-show-#{mode}-diff", + title: title, + data: { file_hash: file_hash, diff_toggle_entity: entity } + ) do sprite_icon(icon) end end diff --git a/app/helpers/dashboard_helper.rb b/app/helpers/dashboard_helper.rb index f0e1f252917a8bf724323104ba186ba66f36b96e..7bb382e14df21039f6b522403bb0546efa7550ba 100644 --- a/app/helpers/dashboard_helper.rb +++ b/app/helpers/dashboard_helper.rb @@ -40,9 +40,14 @@ def feature_entry(title, href: nil, enabled: true, doc_href: nil) end) if doc_href.present? - link_to_doc = link_to(sprite_icon('question'), doc_href, - class: 'gl-ml-2', title: _('Documentation'), - target: '_blank', rel: 'noopener noreferrer') + link_to_doc = link_to( + sprite_icon('question'), + doc_href, + class: 'gl-ml-2', + title: _('Documentation'), + target: '_blank', + rel: 'noopener noreferrer' + ) concat(link_to_doc) end diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index bef2da495b01a44b4c2c6e2eb6b17272297d84ee..795d35ec81fc15b295a3fb2beebd96b6013507e7 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -29,10 +29,11 @@ def localized_action_name_map opened: s_('Event|opened'), updated: s_('Event|updated'), 'removed due to membership expiration from': s_('Event|removed due to membership expiration from') - }.merge(localized_push_action_name_map, - localized_created_project_action_name_map, - localized_design_action_names - ).freeze + }.merge( + localized_push_action_name_map, + localized_created_project_action_name_map, + localized_design_action_names + ).freeze end def localized_push_action_name_map @@ -183,13 +184,11 @@ def event_feed_title(event) def event_feed_url(event) if event.issue? - project_issue_url(event.project, - event.issue) + project_issue_url(event.project, event.issue) elsif event.merge_request? project_merge_request_url(event.project, event.merge_request) elsif event.commit_note? - project_commit_url(event.project, - event.note_target) + project_commit_url(event.project, event.note_target) elsif event.note? if event.note_target event_note_target_url(event) @@ -204,16 +203,12 @@ def event_feed_url(event) def push_event_feed_url(event) if event.push_with_commits? && event.md_ref? if event.commits_count > 1 - project_compare_url(event.project, - from: event.commit_from, to: - event.commit_to) + project_compare_url(event.project, from: event.commit_from, to: event.commit_to) else - project_commit_url(event.project, - id: event.commit_to) + project_commit_url(event.project, id: event.commit_to) end elsif event.ref_name - project_commits_url(event.project, - event.ref_name) + project_commits_url(event.project, event.ref_name) end end @@ -241,26 +236,31 @@ def event_note_target_url(event) elsif event.design_note? design_url(event.note_target, anchor: dom_id(event.note)) else - polymorphic_url([event.project, event.note_target], - anchor: dom_id(event.target)) + polymorphic_url([event.project, event.note_target], anchor: dom_id(event.target)) end end def event_wiki_title_html(event) capture do concat content_tag(:span, _('wiki page'), class: "event-target-type gl-mr-2") - concat link_to(event.target_title, event_wiki_page_target_url(event), - title: event.target_title, - class: 'has-tooltip event-target-link gl-mr-2') + concat link_to( + event.target_title, + event_wiki_page_target_url(event), + title: event.target_title, + class: 'has-tooltip event-target-link gl-mr-2' + ) end end def event_design_title_html(event) capture do concat content_tag(:span, _('design'), class: "event-target-type gl-mr-2") - concat link_to(event.design.reference_link_text, design_url(event.design), - title: event.target_title, - class: 'has-tooltip event-design event-target-link gl-mr-2') + concat link_to( + event.design.reference_link_text, + design_url(event.design), + title: event.target_title, + class: 'has-tooltip event-design event-target-link gl-mr-2' + ) end end diff --git a/app/helpers/feature_flags_helper.rb b/app/helpers/feature_flags_helper.rb index 3dde29dce9195336b0a36afc3a7a51cc771ae51a..fe8d8e6b5d98d16efc0c1dfd17f2c036f4938523 100644 --- a/app/helpers/feature_flags_helper.rb +++ b/app/helpers/feature_flags_helper.rb @@ -18,8 +18,10 @@ def edit_feature_flag_data feature_flags_path: project_feature_flags_path(@project), environments_endpoint: search_project_environments_path(@project, format: :json), strategy_type_docs_page_path: help_page_path('operations/feature_flags', anchor: 'feature-flag-strategies'), - environments_scope_docs_path: help_page_path('ci/environments/index.md', - anchor: 'limit-the-environment-scope-of-a-cicd-variable') + environments_scope_docs_path: help_page_path( + 'ci/environments/index.md', + anchor: 'limit-the-environment-scope-of-a-cicd-variable' + ) } end end diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 0d93aff2baea6b8f3a7e47e8a2b98328d80e4e11..9c68f54f42eb3705a1c5aabd2691fa6b545e6b7a 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -380,8 +380,10 @@ def state_name_with_icon(issuable) end def hidden_issuable_icon(issuable) - title = format(_('This %{issuable} is hidden because its author has been banned'), - issuable: issuable.is_a?(Issue) ? _('issue') : _('merge request')) + title = format( + _('This %{issuable} is hidden because its author has been banned'), + issuable: issuable.is_a?(Issue) ? _('issue') : _('merge request') + ) content_tag(:span, class: 'has-tooltip', title: title) do sprite_icon('spam', css_class: 'gl-vertical-align-text-bottom') end diff --git a/app/helpers/mirror_helper.rb b/app/helpers/mirror_helper.rb index 3dfd30f07db715e229cc3d19bf4860fbbb392e67..06deaeb5e9e753030ff6daa60dfa8c7fa0c57aee 100644 --- a/app/helpers/mirror_helper.rb +++ b/app/helpers/mirror_helper.rb @@ -13,7 +13,7 @@ def mirror_lfs_sync_message docs_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: docs_link_url } html_escape(_('Git LFS objects will be synced if LFS is %{docs_link_start}enabled for the project%{docs_link_end}. Push mirrors will %{strong_open}not%{strong_close} sync LFS objects over SSH.')) % - { docs_link_start: docs_link_start, docs_link_end: '</a>'.html_safe, strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe } + { docs_link_start: docs_link_start, docs_link_end: '</a>'.html_safe, strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe } end end diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb index b47f4633348e6796ca01716e4f1253c018a93643..3df9d68b03e4c2c6599faa7d9dbfc7db677e745c 100644 --- a/app/helpers/notes_helper.rb +++ b/app/helpers/notes_helper.rb @@ -77,8 +77,10 @@ def link_to_reply_discussion(discussion, line_type = nil) line_type: line_type } - button_tag 'Reply...', class: 'btn btn-text-field js-discussion-reply-button', - data: data, title: 'Add a reply' + button_tag 'Reply...', + class: 'btn btn-text-field js-discussion-reply-button', + data: data, + title: 'Add a reply' end def note_max_access_for_user(note) diff --git a/app/helpers/projects/error_tracking_helper.rb b/app/helpers/projects/error_tracking_helper.rb index 471565d162c63338778b1a894d7ff584653134ee..fc4ad10db2131a913ad50d55585fdb79d1835051 100644 --- a/app/helpers/projects/error_tracking_helper.rb +++ b/app/helpers/projects/error_tracking_helper.rb @@ -5,8 +5,7 @@ def error_tracking_data(current_user, project) error_tracking_enabled = !!project.error_tracking_setting&.enabled? { - 'index-path' => project_error_tracking_index_path(project, - format: :json), + 'index-path' => project_error_tracking_index_path(project, format: :json), 'user-can-enable-error-tracking' => can?(current_user, :admin_operations, project).to_s, 'enable-error-tracking-link' => project_settings_operations_path(project), 'error-tracking-enabled' => error_tracking_enabled.to_s, diff --git a/app/helpers/snippets_helper.rb b/app/helpers/snippets_helper.rb index 8558c6649771e4af5167c544091ef5fead8ca98a..2f9117a74beaa0886ea9a917912efc6d89f3b553 100644 --- a/app/helpers/snippets_helper.rb +++ b/app/helpers/snippets_helper.rb @@ -45,30 +45,35 @@ def snippet_report_abuse_path(snippet) def embedded_raw_snippet_button(snippet, blob) return if blob.empty? || blob.binary? || blob.stored_externally? - link_to(external_snippet_icon('doc-code'), - gitlab_raw_snippet_blob_url(snippet, blob.path), - class: 'gl-button btn btn-default', - target: '_blank', - rel: 'noopener noreferrer', - title: 'Open raw') + link_to( + external_snippet_icon('doc-code'), + gitlab_raw_snippet_blob_url(snippet, blob.path), + class: 'gl-button btn btn-default', + target: '_blank', + rel: 'noopener noreferrer', + title: 'Open raw' + ) end def embedded_snippet_download_button(snippet, blob) - link_to(external_snippet_icon('download'), - gitlab_raw_snippet_blob_url(snippet, blob.path, nil, inline: false), - class: 'gl-button btn btn-default', - target: '_blank', - title: 'Download', - rel: 'noopener noreferrer') + link_to( + external_snippet_icon('download'), + gitlab_raw_snippet_blob_url(snippet, blob.path, nil, inline: false), + class: 'gl-button btn btn-default', + target: '_blank', + title: 'Download', + rel: 'noopener noreferrer' + ) end def embedded_copy_snippet_button(blob) return unless blob.rendered_as_text?(ignore_errors: false) - content_tag(:button, - class: 'gl-button btn btn-default copy-to-clipboard-btn', - title: 'Copy snippet contents', - onclick: "copyToClipboard('.blob-content[data-blob-id=\"#{blob.id}\"] > pre')" + content_tag( + :button, + class: 'gl-button btn btn-default copy-to-clipboard-btn', + title: 'Copy snippet contents', + onclick: "copyToClipboard('.blob-content[data-blob-id=\"#{blob.id}\"] > pre')" ) do external_snippet_icon('copy-to-clipboard') end diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb index 4a9dd30a5a27c091d0819f6f8c24e89c2716159f..9b0810f3d17c6f47234a11431c8528f5b4a9f99a 100644 --- a/app/helpers/todos_helper.rb +++ b/app/helpers/todos_helper.rb @@ -232,13 +232,15 @@ def todo_due_date(todo) '' end + due_date = + if is_due_today + _("today") + else + l(todo.target.due_date, format: Date::DATE_FORMATS[:medium]) + end + content = content_tag(:span, class: css_class) do - format(s_("Todos|Due %{due_date}"), due_date: if is_due_today - _("today") - else - l(todo.target.due_date, - format: Date::DATE_FORMATS[:medium]) - end) + format(s_("Todos|Due %{due_date}"), due_date: due_date) end "#{content} ·".html_safe diff --git a/app/helpers/users/group_callouts_helper.rb b/app/helpers/users/group_callouts_helper.rb index 0aa4eb89499a2a5ff830b6f72bd145b7eaff3aa1..92cf41400e7ce2b2687da2f3b567534622c2b865 100644 --- a/app/helpers/users/group_callouts_helper.rb +++ b/app/helpers/users/group_callouts_helper.rb @@ -17,9 +17,11 @@ def show_invite_banner?(group) def user_dismissed_for_group(feature_name, group, ignore_dismissal_earlier_than = nil) return false unless current_user - current_user.dismissed_callout_for_group?(feature_name: feature_name, - group: group, - ignore_dismissal_earlier_than: ignore_dismissal_earlier_than) + current_user.dismissed_callout_for_group?( + feature_name: feature_name, + group: group, + ignore_dismissal_earlier_than: ignore_dismissal_earlier_than + ) end def just_created? diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 4c8765618d080e6f0809e7133b61ea2d1634637f..e0cf7aa61ee8c2d640e0aaa8e12e430c1c1c2be9 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -16,9 +16,7 @@ def user_clear_status_at(user) end def user_link(user) - link_to(user.name, user_path(user), - title: user.email, - class: 'has-tooltip commit-committer-link') + link_to(user.name, user_path(user), title: user.email, class: 'has-tooltip commit-committer-link') end def user_email_help_text(user) @@ -86,9 +84,9 @@ def user_status(user) return unless user.status content_tag :span, - class: 'user-status-emoji has-tooltip', - title: user.status.message_html, - data: { html: true, placement: 'top' } do + class: 'user-status-emoji has-tooltip', + title: user.status.message_html, + data: { html: true, placement: 'top' } do emoji_icon user.status.emoji end end diff --git a/app/helpers/visibility_level_helper.rb b/app/helpers/visibility_level_helper.rb index 5ed341ee5e5b1ee3e0c0d9e46d00b1a58ed3c610..c577e2da1bb39d34216259b49c66567dc57a9528 100644 --- a/app/helpers/visibility_level_helper.rb +++ b/app/helpers/visibility_level_helper.rb @@ -44,9 +44,8 @@ def restricted_visibility_levels(show_all = false) Gitlab::CurrentSettings.restricted_visibility_levels || [] end - delegate :default_project_visibility, - :default_group_visibility, - to: :'Gitlab::CurrentSettings.current_application_settings' + delegate :default_project_visibility, :default_group_visibility, + to: :'Gitlab::CurrentSettings.current_application_settings' def disallowed_visibility_level?(form_model, level) return false unless form_model.respond_to?(:visibility_level_allowed?) diff --git a/ee/app/helpers/billing_plans_helper.rb b/ee/app/helpers/billing_plans_helper.rb index 04edb4c50c3f2054b22a8eaf49948e74a7e3f385..76f08c666d637f4d4117e83a788e524233e8ab2b 100644 --- a/ee/app/helpers/billing_plans_helper.rb +++ b/ee/app/helpers/billing_plans_helper.rb @@ -162,14 +162,12 @@ def hand_raise_props(namespace, glm_content:) end def free_plan_billing_hand_raise_props(namespace, glm_content:) - hand_raise_props(namespace, glm_content: glm_content) - .merge(button_text: s_("BillingPlans|Talk to an expert today."), - button_attributes: { - variant: 'link', - class: "gl-vertical-align-text-bottom" - }.to_json, - track_action: 'click_link', - track_label: 'hand_raise_lead_form') + hand_raise_props(namespace, glm_content: glm_content).merge( + button_text: s_("BillingPlans|Talk to an expert today."), + button_attributes: { variant: 'link', class: "gl-vertical-align-text-bottom" }.to_json, + track_action: 'click_link', + track_label: 'hand_raise_lead_form' + ) end def billing_upgrade_button_data(plan) @@ -191,10 +189,7 @@ def start_free_trial_data def add_namespace_plan_to_group_instructions link_end = '</a>'.html_safe - - move_link_url = help_page_path 'user/project/settings/index', - anchor: "transfer-a-project-to-another-namespace" - + move_link_url = help_page_path 'user/project/settings/index', anchor: "transfer-a-project-to-another-namespace" move_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: move_link_url } if current_user.owned_or_maintainers_groups.any? diff --git a/ee/app/helpers/ee/feature_flags_helper.rb b/ee/app/helpers/ee/feature_flags_helper.rb index b2e576571942d2ea2e1ada6529d3dfe39d8c7bdd..0219c7b83cb51c92f598091f8c47dc3ff949fd02 100644 --- a/ee/app/helpers/ee/feature_flags_helper.rb +++ b/ee/app/helpers/ee/feature_flags_helper.rb @@ -6,8 +6,10 @@ module FeatureFlagsHelper override :edit_feature_flag_data def edit_feature_flag_data - super.merge(feature_flag_issues_endpoint: feature_flag_issues_links_endpoint(@project, @feature_flag, current_user), - search_path: feature_flags_search_path(@project, @feature_flag, current_user)) + super.merge( + feature_flag_issues_endpoint: feature_flag_issues_links_endpoint(@project, @feature_flag, current_user), + search_path: feature_flags_search_path(@project, @feature_flag, current_user) + ) end private diff --git a/ee/app/helpers/ee/search_helper.rb b/ee/app/helpers/ee/search_helper.rb index 450c3cec614219c74e06aefdd02ed3ae764e4bfc..bf865a198e315403c2d6972efe5091995a06e9e9 100644 --- a/ee/app/helpers/ee/search_helper.rb +++ b/ee/app/helpers/ee/search_helper.rb @@ -87,25 +87,32 @@ def advanced_search_status_marker(project) enabled = project.nil? || ref.blank? || ref == project.default_branch tags = {} - tags[:doc_link_start], tags[:doc_link_end] = tag.a(PLACEHOLDER, - href: help_page_path('user/search/advanced_search'), - rel: :noopener, - target: '_blank') - .split(PLACEHOLDER) + tags[:doc_link_start], tags[:doc_link_end] = tag.a( + PLACEHOLDER, + href: help_page_path('user/search/advanced_search'), + rel: :noopener, + target: '_blank' + ).split(PLACEHOLDER) unless enabled tags[:ref_elem] = tag.a(href: '#', class: 'ref-truncated has-tooltip', data: { title: ref }) do tag.code(ref, class: 'gl-white-space-nowrap') end + tags[:default_branch] = tag.code(project.default_branch) - tags[:default_branch_link_start], tags[:default_branch_link_end] = link_to(PLACEHOLDER, - search_path(safe_params.except(:repository_ref)), - data: { testid: 'es-search-default-branch' }) - .split(PLACEHOLDER) - tags[:docs_link] = link_to(_('Learn more.'), - help_page_path('user/search/advanced_search', anchor: 'use-the-advanced-search-syntax'), - target: '_blank', - rel: 'noopener noreferrer') + + tags[:default_branch_link_start], tags[:default_branch_link_end] = link_to( + PLACEHOLDER, + search_path(safe_params.except(:repository_ref)), + data: { testid: 'es-search-default-branch' } + ).split(PLACEHOLDER) + + tags[:docs_link] = link_to( + _('Learn more.'), + help_page_path('user/search/advanced_search', anchor: 'use-the-advanced-search-syntax'), + target: '_blank', + rel: 'noopener noreferrer' + ) end # making sure all the tags are marked `html_safe`