diff options
Diffstat (limited to 'app/views')
51 files changed, 94 insertions, 93 deletions
diff --git a/app/views/admin/application_settings/_outbound.html.haml b/app/views/admin/application_settings/_outbound.html.haml index 6efafa3c415..8cb25627dfa 100644 --- a/app/views/admin/application_settings/_outbound.html.haml +++ b/app/views/admin/application_settings/_outbound.html.haml @@ -11,7 +11,7 @@ = render Pajamas::AlertComponent.new(variant: :warning, dismissible: false, alert_options: { class: "gl-mb-3 js-deny-all-requests-warning #{'gl-display-none' unless deny_all_requests}" }) do |c| - = c.body do + - c.with_body do = s_('OutboundRequests|Webhooks and integrations might not work properly.') = f.gitlab_ui_checkbox_component :allow_local_requests_from_web_hooks_and_services, s_('OutboundRequests|Allow requests to the local network from webhooks and integrations'), diff --git a/app/views/admin/application_settings/service_usage_data.html.haml b/app/views/admin/application_settings/service_usage_data.html.haml index ead2b2fd666..e42c1091bf2 100644 --- a/app/views/admin/application_settings/service_usage_data.html.haml +++ b/app/views/admin/application_settings/service_usage_data.html.haml @@ -22,7 +22,7 @@ dismissible: false, title: _('Service Ping payload not found in the application cache')) do |c| - = c.body do + - c.with_body do - enable_service_ping_link_url = help_page_path('user/admin_area/settings/usage_statistics', anchor: 'enable-or-disable-usage-statistics') - enable_service_ping_link = '<a href="%{url}">'.html_safe % { url: enable_service_ping_link_url } - generate_manually_link_url = help_page_path('development/service_ping/troubleshooting', anchor: 'generate-service-ping') diff --git a/app/views/admin/dashboard/_security_newsletter_callout.html.haml b/app/views/admin/dashboard/_security_newsletter_callout.html.haml index 7495298936d..0bdeef9acea 100644 --- a/app/views/admin/dashboard/_security_newsletter_callout.html.haml +++ b/app/views/admin/dashboard/_security_newsletter_callout.html.haml @@ -7,8 +7,8 @@ dismiss_endpoint: callouts_path, defer_links: 'true' }}, close_button_options: { data: { testid: 'close-security-newsletter-callout' }}) do |c| - = c.body do + - c.with_body do = s_('AdminArea|Sign up for the GitLab Security Newsletter to get notified for security updates.') - = c.actions do + - c.with_actions do = render Pajamas::ButtonComponent.new(variant: :confirm, href: 'https://about.gitlab.com/company/preference-center/', target: '_blank', button_options: { class: 'deferred-link gl-alert-action', rel: 'noreferrer noopener' }) do = s_('AdminArea|Sign up for the GitLab newsletter') diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml index 01d47facb5c..4973c0f985c 100644 --- a/app/views/admin/dashboard/index.html.haml +++ b/app/views/admin/dashboard/index.html.haml @@ -26,7 +26,7 @@ footer_options: { class: 'gl-bg-transparent'} } .col-md-4.gl-mb-6 = render Pajamas::CardComponent.new(**component_params) do |c| - = c.body do + - c.with_body do %span .d-flex.align-items-center = sprite_icon('project', size: 16, css_class: 'gl-text-gray-700') @@ -34,13 +34,13 @@ .gl-mt-3.text-uppercase= s_('AdminArea|Projects') = render Pajamas::ButtonComponent.new(href: new_project_path) do = s_('AdminArea|New project') - = c.footer do + - c.with_footer do .d-flex.align-items-center = link_to(s_('AdminArea|View latest projects'), admin_projects_path(sort: 'created_desc')) = sprite_icon('chevron-right', size: 12, css_class: 'gl-text-gray-700 gl-ml-2') .col-md-4.gl-mb-6 = render Pajamas::CardComponent.new(**component_params) do |c| - = c.body do + - c.with_body do %span .d-flex.align-items-center = sprite_icon('users', size: 16, css_class: 'gl-text-gray-700') @@ -58,13 +58,13 @@ = link_to(s_('AdminArea|Users statistics'), admin_dashboard_stats_path, class: "text-capitalize gl-ml-2") = render Pajamas::ButtonComponent.new(href: new_admin_user_path) do = s_('AdminArea|New user') - = c.footer do + - c.with_footer do .d-flex.align-items-center = link_to(s_('AdminArea|View latest users'), admin_users_path({ sort: 'created_desc' })) = sprite_icon('chevron-right', size: 12, css_class: 'gl-text-gray-700 gl-ml-2') .col-md-4.gl-mb-6 = render Pajamas::CardComponent.new(**component_params) do |c| - = c.body do + - c.with_body do %span .d-flex.align-items-center = sprite_icon('group', size: 16, css_class: 'gl-text-gray-700') @@ -72,7 +72,7 @@ .gl-mt-3.text-uppercase= s_('AdminArea|Groups') = render Pajamas::ButtonComponent.new(href: new_admin_group_path) do = s_('AdminArea|New group') - = c.footer do + - c.with_footer do .d-flex.align-items-center = link_to(s_('AdminArea|View latest groups'), admin_groups_path(sort: 'created_desc')) = sprite_icon('chevron-right', size: 12, css_class: 'gl-text-gray-700 gl-ml-2') @@ -81,7 +81,7 @@ #js-admin-statistics-container .col-md-4.gl-mb-6 = render Pajamas::CardComponent.new do |c| - = c.body do + - c.with_body do %h4= s_('AdminArea|Features') = feature_entry(_('Sign up'), href: general_admin_application_settings_path(anchor: 'js-signup-settings'), @@ -120,7 +120,7 @@ enabled: Gitlab.config.gitlab_ci.shared_runners_enabled) .col-md-4.gl-mb-6 = render Pajamas::CardComponent.new do |c| - = c.body do + - c.with_body do %h4 = s_('AdminArea|Components') - if show_version_check? @@ -178,7 +178,7 @@ .row .col-md-4.gl-mb-6 = render Pajamas::CardComponent.new do |c| - = c.body do + - c.with_body do %h4= s_('AdminArea|Latest projects') - @projects.each do |project| .gl-display-flex.gl-py-3 @@ -188,7 +188,7 @@ #{time_ago_with_tooltip(project.created_at)} .col-md-4.gl-mb-6 = render Pajamas::CardComponent.new do |c| - = c.body do + - c.with_body do %h4= s_('AdminArea|Latest users') - @users.each do |user| .gl-display-flex.gl-py-3 @@ -199,7 +199,7 @@ #{time_ago_with_tooltip(user.created_at)} .col-md-4.gl-mb-6 = render Pajamas::CardComponent.new do |c| - = c.body do + - c.with_body do %h4= s_('AdminArea|Latest groups') - @groups.each do |group| .gl-display-flex.gl-py-3 diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml index 20ee8c9f310..b708564e23a 100644 --- a/app/views/admin/groups/_form.html.haml +++ b/app/views/admin/groups/_form.html.haml @@ -1,11 +1,11 @@ = gitlab_ui_form_for [:admin, @group] do |f| = form_errors(@group) = render ::Layouts::HorizontalSectionComponent.new(options: { class: 'gl-mb-6' }) do |c| - = c.title { _('Naming, visibility') } - = c.description do + - c.with_title { _('Naming, visibility') } + - c.with_description do = _('Update your group name, description, avatar, and visibility.') = link_to _('Learn more about groups.'), help_page_path('user/group/index') - = c.body do + - c.with_body do = render 'shared/groups/group_name_and_path_fields', f: f = render 'shared/group_form_description', f: f .form-group.gl-form-group{ role: 'group' } @@ -14,10 +14,10 @@ = render 'shared/old_visibility_level', f: f, visibility_level: visibility_level, can_change_visibility_level: can_change_group_visibility_level?(@group), form_model: @group, with_label: false = render ::Layouts::HorizontalSectionComponent.new(options: { class: 'gl-pb-3 gl-mb-6' }) do |c| - = c.title { _('Permissions and group features') } - = c.description do + - c.with_title { _('Permissions and group features') } + - c.with_description do = _('Configure advanced permissions, Large File Storage, two-factor authentication, and CI/CD settings.') - = c.body do + - c.with_body do = render_if_exists 'shared/old_repository_size_limit_setting', form: f, type: :group = render_if_exists 'admin/namespace_plan', f: f .form-group.gl-form-group{ role: 'group' } @@ -26,13 +26,13 @@ = render_if_exists 'namespaces/shared_runners_minutes_settings', group: @group, form: f = render ::Layouts::HorizontalSectionComponent.new(border: false, options: { class: 'gl-pb-3' }) do |c| - = c.title { _('Admin notes') } - = c.body do + - c.with_title { _('Admin notes') } + - c.with_body do = render 'shared/admin/admin_note_form', f: f - if @group.new_record? = render Pajamas::AlertComponent.new(dismissible: false) do |c| - = c.body do + - c.with_body do = render 'shared/group_tips' .gl-mt-5 = f.submit _('Create group'), pajamas_button: true diff --git a/app/views/admin/health_check/show.html.haml b/app/views/admin/health_check/show.html.haml index e7aa4f38634..662234bf56a 100644 --- a/app/views/admin/health_check/show.html.haml +++ b/app/views/admin/health_check/show.html.haml @@ -23,7 +23,7 @@ = render_if_exists 'admin/health_check/health_check_url' %hr = render Pajamas::CardComponent.new do |c| - = c.header do + - c.with_header do Current Status: - if no_errors = sprite_icon('check', css_class: 'cgreen') @@ -31,7 +31,7 @@ - else = sprite_icon('warning-solid', css_class: 'cred') #{ s_('HealthCheck|Unhealthy') } - = c.body do + - c.with_body do - if no_errors #{ s_('HealthCheck|No Health Problems Detected') } - else diff --git a/app/views/admin/projects/_form.html.haml b/app/views/admin/projects/_form.html.haml index dbb4f3a63cc..61bf97d8214 100644 --- a/app/views/admin/projects/_form.html.haml +++ b/app/views/admin/projects/_form.html.haml @@ -1,10 +1,10 @@ = gitlab_ui_form_for [:admin, @project] do |f| = form_errors(@project) = render ::Layouts::HorizontalSectionComponent.new(options: { class: 'gl-pb-3 gl-mb-6' }) do |c| - = c.title { _('Naming') } - = c.description do + - c.with_title { _('Naming') } + - c.with_description do = _('Update your project name and description.') - = c.body do + - c.with_body do .form-group.gl-form-group = f.label :name, _('Project name') = f.text_field :name, class: 'form-control gl-form-input gl-md-form-input-md' @@ -18,10 +18,10 @@ = f.text_area :description, class: 'form-control gl-form-input gl-form-textarea gl-lg-form-input-xl', rows: 5 = render ::Layouts::HorizontalSectionComponent.new(options: { class: 'gl-pb-3 gl-mb-6' }) do |c| - = c.title { _('Permissions and project features') } - = c.description do + - c.with_title { _('Permissions and project features') } + - c.with_description do = _('Configure advanced permissions') - = c.body do + - c.with_body do - if @project.project_setting.present? .form-group.gl-form-group %legend.col-form-label.col-form-label diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml index 2ba305ebaea..8eb72fa281e 100644 --- a/app/views/admin/projects/show.html.haml +++ b/app/views/admin/projects/show.html.haml @@ -17,7 +17,7 @@ = render Pajamas::AlertComponent.new(variant: :danger, alert_options: { class: 'gl-mb-5', data: { testid: 'last-repository-check-failed-alert' }}) do |c| - = c.body do + - c.with_body do - last_check_message = _("Last repository check (%{last_check_timestamp}) failed. See the 'repocheck.log' file for error messages.") - last_check_message = last_check_message % { last_check_timestamp: time_ago_with_tooltip(@project.last_repository_check_at) } = last_check_message.html_safe diff --git a/app/views/admin/runners/edit.html.haml b/app/views/admin/runners/edit.html.haml index 05f0c957100..3d245722270 100644 --- a/app/views/admin/runners/edit.html.haml +++ b/app/views/admin/runners/edit.html.haml @@ -23,7 +23,7 @@ = render Pajamas::AlertComponent.new(variant: :danger, dismissible: false, title: project.full_name) do |c| - = c.actions do + - c.with_actions do = render Pajamas::ButtonComponent.new(variant: :confirm, href: admin_namespace_project_runner_project_path(project.namespace, project, runner_project), method: :delete) do = _('Disable') diff --git a/app/views/admin/sessions/_new_base.html.haml b/app/views/admin/sessions/_new_base.html.haml index 7256da75d86..13c647cd45f 100644 --- a/app/views/admin/sessions/_new_base.html.haml +++ b/app/views/admin/sessions/_new_base.html.haml @@ -1,7 +1,7 @@ = form_tag(admin_session_path, method: :post, class: 'new_user gl-show-field-errors', 'aria-live': 'assertive') do .form-group = label_tag :user_password, _('Password'), class: 'label-bold' - = password_field_tag 'user[password]', nil, class: 'form-control', autocomplete: 'current-password', required: true, title: _('This field is required.'), data: { qa_selector: 'password_field', testid: 'password-field' } + = password_field_tag 'user[password]', nil, { class: 'form-control js-password', data: { id: 'user_password', name: 'user[password]', qa_selector: 'password_field', testid: 'password-field' } } .submit-container.move-submit-down = submit_tag _('Enter admin mode'), class: 'gl-button btn btn-confirm', data: { qa_selector: 'enter_admin_mode_button' } diff --git a/app/views/admin/sessions/two_factor.html.haml b/app/views/admin/sessions/two_factor.html.haml index 3eb2b45c0de..3bbf768d7be 100644 --- a/app/views/admin/sessions/two_factor.html.haml +++ b/app/views/admin/sessions/two_factor.html.haml @@ -9,7 +9,7 @@ .tab-content .login-box.tab-pane.gl-p-5.active{ id: 'login-pane', role: 'tabpanel' } .login-body - - if current_user.sign_in_with_codes_allowed? + - if current_user.two_factor_enabled? = render 'admin/sessions/two_factor_otp' - if current_user.two_factor_webauthn_enabled? = render 'authentication/authenticate', render_remember_me: false, target_path: admin_session_path diff --git a/app/views/admin/system_info/show.html.haml b/app/views/admin/system_info/show.html.haml index 75d23ee3094..d3d2ebb90da 100644 --- a/app/views/admin/system_info/show.html.haml +++ b/app/views/admin/system_info/show.html.haml @@ -4,7 +4,7 @@ .row .col-sm = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-3' }) do |c| - = c.body do + - c.with_body do %h4 = sprite_icon('pod', size: 18, css_class: 'gl-text-gray-700') = _('CPU') @@ -16,7 +16,7 @@ = _('Unable to collect CPU info') = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-3' }) do |c| - = c.body do + - c.with_body do %h4 = sprite_icon('status-health', size: 18, css_class: 'gl-text-gray-700') = _('Memory Usage') @@ -28,7 +28,7 @@ = _('Unable to collect memory info') = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-3' }) do |c| - = c.body do + - c.with_body do %h4 = sprite_icon('clock', size: 18, css_class: 'gl-text-gray-700') = _('System started') @@ -36,7 +36,7 @@ %h2= time_ago_with_tooltip(Rails.application.config.booted_at) .col-sm = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-3' }) do |c| - = c.body do + - c.with_body do %h4 = sprite_icon('disk', size: 18, css_class: 'gl-text-gray-700') = _('Disk Usage') diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml index fb4c7a645ca..8822d52c3c0 100644 --- a/app/views/admin/users/_form.html.haml +++ b/app/views/admin/users/_form.html.haml @@ -28,7 +28,7 @@ .col-lg-8 - if @user.new_record? = render Pajamas::AlertComponent.new(variant: :info, dismissible: false, alert_options: { class: 'gl-mb-5' }) do |c| - = c.body do + - c.with_body do = s_('AdminUsers|Reset link will be generated and sent to the user. User will be forced to set the password on first sign in.') - else .form-group.gl-form-group{ role: 'group' } diff --git a/app/views/admin/users/_users.html.haml b/app/views/admin/users/_users.html.haml index 96dd16a96da..c9264535a13 100644 --- a/app/views/admin/users/_users.html.haml +++ b/app/views/admin/users/_users.html.haml @@ -4,7 +4,7 @@ = render Pajamas::AlertComponent.new(variant: :tip, alert_options: { class: 'gl-my-5' }, dismissible: false) do |c| - = c.body do + - c.with_body do = render 'shared/registration_features_discovery_message', feature_title: s_('RegistrationFeatures|send emails to users') .top-area diff --git a/app/views/devise/sessions/_new_base.html.haml b/app/views/devise/sessions/_new_base.html.haml index a5a6c0cff78..698e8c89a08 100644 --- a/app/views/devise/sessions/_new_base.html.haml +++ b/app/views/devise/sessions/_new_base.html.haml @@ -4,7 +4,10 @@ = f.text_field :login, value: @invite_email, class: 'form-control gl-form-input top js-username-field', autofocus: 'autofocus', autocapitalize: 'off', autocorrect: 'off', required: true, title: _('This field is required.'), data: { qa_selector: 'login_field', testid: 'username-field' } .form-group.gl-px-5 = f.label :password, class: "label-bold #{'gl-mb-1' if Feature.enabled?(:restyle_login_page, @project)}" - = f.password_field :password, class: 'form-control gl-form-input bottom', autocomplete: 'current-password', required: true, title: _('This field is required.'), data: { qa_selector: 'password_field', testid: 'password-field' } + = f.password_field :password, class: 'form-control gl-form-input js-password', data: { id: "#{resource_name}_password", + qa_selector: 'password_field', + testid: 'password-field', + name: "#{resource_name}[password]" } .gl-px-5 .gl-display-inline-block - if remember_me_enabled? diff --git a/app/views/devise/sessions/_new_crowd.html.haml b/app/views/devise/sessions/_new_crowd.html.haml index 14038f3c3c7..293e287371a 100644 --- a/app/views/devise/sessions/_new_crowd.html.haml +++ b/app/views/devise/sessions/_new_crowd.html.haml @@ -4,7 +4,7 @@ = text_field_tag :username, nil, { class: "form-control top", title: _("This field is required."), autofocus: "autofocus", required: true } .form-group.gl-px-5 = label_tag :password - = password_field_tag :password, nil, { autocomplete: 'current-password', class: "form-control bottom", title: _("This field is required."), required: true } + = password_field_tag :password, nil, { class: 'form-control gl-form-input js-password', data: { id: 'password', name: 'password' } } - if remember_me_enabled? .remember-me.gl-px-5 %label{ for: "remember_me" } diff --git a/app/views/devise/sessions/_new_ldap.html.haml b/app/views/devise/sessions/_new_ldap.html.haml index 8f9d6ee556e..fb5a57b509c 100644 --- a/app/views/devise/sessions/_new_ldap.html.haml +++ b/app/views/devise/sessions/_new_ldap.html.haml @@ -8,7 +8,7 @@ = text_field_tag :username, nil, { class: "form-control gl-form-input top", title: _("This field is required."), autofocus: "autofocus", data: { qa_selector: 'username_field' }, required: true } .form-group.gl-px-5 = label_tag :password - = password_field_tag :password, nil, { autocomplete: 'current-password', class: "form-control gl-form-input bottom", title: _("This field is required."), data: { qa_selector: 'password_field' }, required: true } + = password_field_tag :password, nil, { class: 'form-control gl-form-input js-password', data: { id: 'password', name: 'password', qa_selector: 'password_field' } } - if render_remember_me .gl-px-5 = render Pajamas::CheckboxTagComponent.new(name: 'remember_me') do |c| diff --git a/app/views/devise/sessions/two_factor.html.haml b/app/views/devise/sessions/two_factor.html.haml index 789f6072b68..06152e3dac5 100644 --- a/app/views/devise/sessions/two_factor.html.haml +++ b/app/views/devise/sessions/two_factor.html.haml @@ -2,7 +2,7 @@ = render 'devise/shared/tab_single', tab_title: _('Two-Factor Authentication') if Feature.disabled?(:restyle_login_page, @project) .login-box.gl-p-5 .login-body - - if @user.sign_in_with_codes_allowed? + - if @user.two_factor_enabled? = gitlab_ui_form_for(resource, as: resource_name, url: session_path(resource_name), method: :post, html: { class: "edit_user gl-show-field-errors js-2fa-form #{'hidden' if @user.two_factor_webauthn_enabled?}" }) do |f| - resource_params = params[resource_name].presence || params - if remember_me_enabled? diff --git a/app/views/groups/_group_admin_settings.html.haml b/app/views/groups/_group_admin_settings.html.haml index ca11649e162..7f113a1cfd4 100644 --- a/app/views/groups/_group_admin_settings.html.haml +++ b/app/views/groups/_group_admin_settings.html.haml @@ -2,10 +2,10 @@ %legend.col-form-label.col-form-label = _('Large File Storage') = f.gitlab_ui_checkbox_component :lfs_enabled, checkbox_options: { checked: @group.lfs_enabled? } do |c| - = c.label do + - c.with_label do = _('Projects in this group can use Git LFS') = link_to sprite_icon('question-o'), help_page_path('topics/git/lfs/index'), class: 'gl-ml-2' - = c.help_text do + - c.with_help_text do = _('This setting can be overridden in each project.') .form-group.gl-form-group{ role: 'group' } = f.label s_('ProjectCreationLevel|Allowed to create projects'), class: 'gl-display-block col-form-label' diff --git a/app/views/groups/_import_group_from_another_instance_panel.html.haml b/app/views/groups/_import_group_from_another_instance_panel.html.haml index 4a34e124c4c..9fbb7f3c9ed 100644 --- a/app/views/groups/_import_group_from_another_instance_panel.html.haml +++ b/app/views/groups/_import_group_from_another_instance_panel.html.haml @@ -9,7 +9,7 @@ - if bulk_imports_disabled = render Pajamas::AlertComponent.new(dismissible: false, variant: :tip) do |c| - = c.body do + - c.with_body do = s_('GroupsNew|Importing groups by direct transfer is currently disabled.') - if current_user.admin? @@ -24,7 +24,7 @@ - else = render Pajamas::AlertComponent.new(dismissible: false, variant: :warning) do |c| - = c.body do + - c.with_body do - docs_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/group/import/index.md', anchor: 'migrated-group-items') } - docs_link_end = '</a>'.html_safe = s_('GroupsNew|Not all group items are migrated. %{docs_link_start}What items are migrated%{docs_link_end}?').html_safe % { docs_link_start: docs_link_start, docs_link_end: docs_link_end } diff --git a/app/views/groups/_import_group_from_file_panel.html.haml b/app/views/groups/_import_group_from_file_panel.html.haml index 775b9c79817..91f7b574dbf 100644 --- a/app/views/groups/_import_group_from_file_panel.html.haml +++ b/app/views/groups/_import_group_from_file_panel.html.haml @@ -9,7 +9,7 @@ = render Pajamas::AlertComponent.new(variant: :warning, alert_options: { class: 'gl-mb-5' }, dismissible: false) do |c| - = c.body do + - c.with_body do - docs_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/group/import/index.md', anchor: 'migrate-groups-by-direct-transfer-recommended') } - link_end = '</a>'.html_safe = s_('GroupsNew|This feature is deprecated and replaced by group migration by direct transfer. %{docs_link_start}Learn more%{docs_link_end}.').html_safe % { docs_link_start: docs_link_start, docs_link_end: link_end } diff --git a/app/views/groups/projects.html.haml b/app/views/groups/projects.html.haml index dda0cb78458..ed078230349 100644 --- a/app/views/groups/projects.html.haml +++ b/app/views/groups/projects.html.haml @@ -3,14 +3,14 @@ - @force_desktop_expanded_sidebar = true = render Pajamas::CardComponent.new(card_options: { class: 'gl-mt-3 js-search-settings-section' }, header_options: { class: 'gl-display-flex' }, body_options: { class: 'gl-py-0' }) do |c| - - c.header do + - c.with_header do .gl-flex-grow-1 = html_escape(_("%{strong_open}%{group_name}%{strong_close} projects:")) % { strong_open: '<strong>'.html_safe, group_name: @group.name, strong_close: '</strong>'.html_safe } - if can? current_user, :admin_group, @group .controls = render Pajamas::ButtonComponent.new(href: new_project_path(namespace_id: @group.id), size: :small, variant: :confirm) do = _("New project") - - c.body do + - c.with_body do %ul.content-list - @projects.each_with_index do |project, idx| %li.project-row.gl-align-items-center{ class: 'gl-display-flex!', data: { qa_selector: 'project_row_container', qa_index: idx } } diff --git a/app/views/groups/settings/_export.html.haml b/app/views/groups/settings/_export.html.haml index 6b505755727..1e80c1846a4 100644 --- a/app/views/groups/settings/_export.html.haml +++ b/app/views/groups/settings/_export.html.haml @@ -4,7 +4,7 @@ %h4= s_('GroupSettings|Export group') %p= _('Export this group with all related data.') = render Pajamas::AlertComponent.new(variant: :warning, dismissible: false, alert_options: { class: 'gl-mb-4' }) do |c| - = c.body do + - c.with_body do - docs_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/group/import/index', anchor: 'migrate-groups-by-direct-transfer-recommended') } - docs_link_end = '</a>'.html_safe = s_('GroupsNew|This feature is deprecated and replaced by group migration by direct transfer. %{docs_link_start}Learn more%{docs_link_end}.').html_safe % { docs_link_start: docs_link_start, docs_link_end: docs_link_end } @@ -12,7 +12,7 @@ - export_information = _('After the export is complete, download the data file from a notification email or from this page. You can then import the data file from the %{strong_text_start}Create new group%{strong_text_end} page of another GitLab instance.') % { strong_text_start: '<strong>'.html_safe, strong_text_end: '</strong>'.html_safe} = export_information.html_safe = render Pajamas::AlertComponent.new(dismissible: false, alert_options: { class: 'gl-mb-5' }) do |c| - = c.body do + - c.with_body do %p.gl-mb-0 %p= _('The following items will be exported:') %ul diff --git a/app/views/groups/settings/_remove_button.html.haml b/app/views/groups/settings/_remove_button.html.haml index cb05076b39d..acf11fd8858 100644 --- a/app/views/groups/settings/_remove_button.html.haml +++ b/app/views/groups/settings/_remove_button.html.haml @@ -2,7 +2,7 @@ - if group.prevent_delete? = render Pajamas::AlertComponent.new(dismissible: false, alert_options: { class: 'gl-mb-5', data: { testid: 'group-has-linked-subscription-alert' }}) do |c| - = c.body do + - c.with_body do = html_escape(_("This group can't be removed because it is linked to a subscription. To remove this group, %{linkStart}link the subscription%{linkEnd} with a different group.")) % { linkStart: "<a href=\"#{help_page_path('subscriptions/gitlab_com/index', anchor: 'change-the-linked-namespace')}\">".html_safe, linkEnd: '</a>'.html_safe } .js-confirm-danger{ data: group_settings_confirm_modal_data(group, remove_form_id) } diff --git a/app/views/groups/settings/_transfer.html.haml b/app/views/groups/settings/_transfer.html.haml index 415459f1584..9ebe3a740b3 100644 --- a/app/views/groups/settings/_transfer.html.haml +++ b/app/views/groups/settings/_transfer.html.haml @@ -15,6 +15,6 @@ %li= s_("GroupSettings|If the parent group's visibility is lower than the group's current visibility, visibility levels for subgroups and projects will be changed to match the new parent group's visibility.") - if group.paid? = render Pajamas::AlertComponent.new(dismissible: false, alert_options: { class: 'gl-mb-5' }) do |c| - = c.body do + - c.with_body do = html_escape(_("This group can't be transferred because it is linked to a subscription. To transfer this group, %{linkStart}link the subscription%{linkEnd} with a different group.")) % { linkStart: "<a href=\"#{help_page_path('subscriptions/gitlab_com/index', anchor: 'change-the-linked-namespace')}\">".html_safe, linkEnd: '</a>'.html_safe } .js-transfer-group-form{ data: initial_data } diff --git a/app/views/groups/settings/ci_cd/_auto_devops_form.html.haml b/app/views/groups/settings/ci_cd/_auto_devops_form.html.haml index 8c45809261c..b0a5d0bd4fa 100644 --- a/app/views/groups/settings/ci_cd/_auto_devops_form.html.haml +++ b/app/views/groups/settings/ci_cd/_auto_devops_form.html.haml @@ -3,7 +3,7 @@ %fieldset .form-group = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-3' }) do |c| - - c.body do + - c.with_body do - learn_more_link = link_to _('Learn more.'), help_page_path('topics/autodevops/index.md'), target: '_blank', rel: 'noopener noreferrer' - help_text = s_('GroupSettings|The Auto DevOps pipeline runs if no alternative CI configuration file is found.') - badge = gl_badge_tag badge_for_auto_devops_scope(group), variant: :info diff --git a/app/views/projects/_deletion_failed.html.haml b/app/views/projects/_deletion_failed.html.haml index 489d303c5b9..29551505a7e 100644 --- a/app/views/projects/_deletion_failed.html.haml +++ b/app/views/projects/_deletion_failed.html.haml @@ -4,6 +4,6 @@ = render Pajamas::AlertComponent.new(variant: :warning, dismissible: false, alert_options: { class: 'project-deletion-failed-message' }) do |c| - = c.body do + - c.with_body do This project was scheduled for deletion, but failed with the following message: = project.delete_error diff --git a/app/views/projects/_import_project_pane.html.haml b/app/views/projects/_import_project_pane.html.haml index 1d6e47aca49..947a1007fd5 100644 --- a/app/views/projects/_import_project_pane.html.haml +++ b/app/views/projects/_import_project_pane.html.haml @@ -11,7 +11,7 @@ = render Pajamas::AlertComponent.new(variant: :tip, alert_options: { class: 'gl-my-3' }, dismissible: false) do |c| - = c.body do + - c.with_body do - docs_link_url = help_page_path('user/group/import/index') + '#migrate-groups-by-direct-transfer-recommended' - docs_link = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: docs_link_url } = html_escape(_("Importing GitLab projects? Migrating GitLab projects when migrating groups by direct transfer is in Beta. %{link_start}Learn more.%{link_end}")) % { link_start: docs_link, link_end: '</a>'.html_safe } diff --git a/app/views/projects/_last_push.html.haml b/app/views/projects/_last_push.html.haml index 5b493772f0a..89c91887d19 100644 --- a/app/views/projects/_last_push.html.haml +++ b/app/views/projects/_last_push.html.haml @@ -3,7 +3,7 @@ = render Pajamas::AlertComponent.new(variant: :success, alert_options: { class: 'gl-mt-3' }, close_button_options: { class: 'js-close-banner' }) do |c| - = c.body do + - c.with_body do %span= s_("LastPushEvent|You pushed to") %strong.gl-display-inline-flex.gl-max-w-50p{ data: { toggle: 'tooltip' }, title: event.ref_name } = link_to event.ref_name, project_commits_path(event.project, event.ref_name), class: 'ref-name gl-text-truncate' @@ -15,6 +15,6 @@ #{time_ago_with_tooltip(event.created_at)} - if create_mr_button_from_event?(event) - = c.actions do + - c.with_actions do = render Pajamas::ButtonComponent.new(variant: :confirm, href: create_mr_path_from_push_event(event), button_options: { data: { qa_selector: 'create_merge_request_button' }}) do = _('Create merge request') diff --git a/app/views/projects/_new_project_fields.html.haml b/app/views/projects/_new_project_fields.html.haml index 27211ffb1e5..70a2476c8e5 100644 --- a/app/views/projects/_new_project_fields.html.haml +++ b/app/views/projects/_new_project_fields.html.haml @@ -46,7 +46,7 @@ = render Pajamas::AlertComponent.new(alert_options: { class: "gl-mb-4 gl-display-none js-user-readme-repo" }, dismissible: false, variant: :success) do |c| - = c.body do + - c.with_body do - help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/profile/index', anchor: 'add-details-to-your-profile-with-a-readme') } = html_escape(_('%{project_path} is a project that you can use to add a README to your GitLab profile. Create a public project and initialize the repository with a README to get started. %{help_link_start}Learn more.%{help_link_end}')) % { project_path: "<strong>#{current_user.username} / #{current_user.username}</strong>".html_safe, help_link_start: help_link_start, help_link_end: '</a>'.html_safe } @@ -81,17 +81,17 @@ = render Pajamas::CheckboxTagComponent.new(name: 'project[initialize_with_readme]', checked: true, checkbox_options: { data: { qa_selector: 'initialize_with_readme_checkbox', track_label: track_label, track_action: 'activate_form_input', track_property: 'init_with_readme' } }) do |c| - = c.label do + - c.with_label do = s_('ProjectsNew|Initialize repository with a README') - = c.help_text do + - c.with_help_text do = s_('ProjectsNew|Allows you to immediately clone this project’s repository. Skip this if you plan to push up an existing repository.') .form-group = render Pajamas::CheckboxTagComponent.new(name: 'project[initialize_with_sast]', checkbox_options: { data: { qa_selector: 'initialize_with_sast_checkbox', track_label: track_label, track_action: 'activate_form_input', track_property: 'init_with_sast' } }) do |c| - = c.label do + - c.with_label do = s_('ProjectsNew|Enable Static Application Security Testing (SAST)') - = c.help_text do + - c.with_help_text do = s_('ProjectsNew|Analyze your source code for known security vulnerabilities.') = link_to _('Learn more.'), help_page_path('user/application_security/sast/index'), target: '_blank', rel: 'noopener noreferrer', data: { track_action: 'followed' } diff --git a/app/views/projects/blob/edit.html.haml b/app/views/projects/blob/edit.html.haml index 0f37ae8ad41..195dc03632a 100644 --- a/app/views/projects/blob/edit.html.haml +++ b/app/views/projects/blob/edit.html.haml @@ -7,7 +7,7 @@ = render Pajamas::AlertComponent.new(alert_options: { class: 'gl-mb-5 gl-mt-5' }, variant: :danger, dismissible: false) do |c| - = c.body do + - c.with_body do - blob_link_start = '<a href="%{url}" class="gl-link" target="_blank" rel="noopener noreferrer">'.html_safe - link_end = '</a>'.html_safe - external_link_icon = content_tag 'span', { aria: { label: _('Opens new window') }} do diff --git a/app/views/projects/branches/_branch_rules_info.haml b/app/views/projects/branches/_branch_rules_info.haml index 15bee31c596..451d0f9928c 100644 --- a/app/views/projects/branches/_branch_rules_info.haml +++ b/app/views/projects/branches/_branch_rules_info.haml @@ -2,10 +2,10 @@ = render Pajamas::AlertComponent.new(variant: :info, title: s_("Branches|See all branch-related settings together with branch rules"), alert_options: { class: 'js-branch-rules-info-callout gl-mb-6 gl-mt-4', data: { feature_id: Users::CalloutsHelper::BRANCH_RULES_INFO_CALLOUT, dismiss_endpoint: callouts_path, defer_links: 'true' } }) do |c| - = c.body do + - c.with_body do = s_("Branches|You can now find an overview of settings for protected branches, merge request approvals, status checks, and security approvals conveniently in one spot.") - = c.actions do + - c.with_actions do = render Pajamas::ButtonComponent.new(variant: :confirm, href: project_settings_repository_path(@project, anchor: 'js-branch-rules'), button_options: { class: 'deferred-link gl-alert-action' }) do = s_("Branches|View branch rules") = render Pajamas::ButtonComponent.new(button_options: { class: 'js-close'}) do diff --git a/app/views/projects/branches/new.html.haml b/app/views/projects/branches/new.html.haml index 86bed956bc4..9fd9943fd26 100644 --- a/app/views/projects/branches/new.html.haml +++ b/app/views/projects/branches/new.html.haml @@ -3,7 +3,7 @@ - if @error = render Pajamas::AlertComponent.new(variant: :danger) do |c| - = c.body do + - c.with_body do = @error %h1.page-title.gl-font-size-h-display = _('New Branch') @@ -21,4 +21,3 @@ = render Pajamas::ButtonComponent.new(variant: :confirm, button_options: { type: 'submit', class: 'gl-mr-3' }) do = _('Create branch') = link_to _('Cancel'), project_branches_path(@project), class: 'gl-button btn btn-default btn-cancel' - diff --git a/app/views/projects/commits/_commits.html.haml b/app/views/projects/commits/_commits.html.haml index a877af20426..9cbabaee774 100644 --- a/app/views/projects/commits/_commits.html.haml +++ b/app/views/projects/commits/_commits.html.haml @@ -38,7 +38,7 @@ %li = render Pajamas::AlertComponent.new(variant: :warning, dismissible: false) do |c| - = c.body do + - c.with_body do = n_('%s additional commit has been omitted to prevent performance issues.', '%s additional commits have been omitted to prevent performance issues.', hidden) % number_with_delimiter(hidden) - if can_update_merge_request && context_commits&.empty? && !(defined?(@next_page) && @next_page) diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index 79202dabff9..02a69f25985 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -11,7 +11,7 @@ = render Pajamas::AlertComponent.new(variant: :info, title: _('GitLab Pages has moved'), alert_options: { class: 'gl-my-5', data: { feature_id: Users::CalloutsHelper::PAGES_MOVED_CALLOUT, dismiss_endpoint: callouts_path, defer_links: 'true' } }) do |c| - = c.body do + - c.with_body do = _('To go to GitLab Pages, on the left sidebar, select %{pages_link}.').html_safe % {pages_link: link_to('Deployments > Pages', project_pages_path(@project)).html_safe} %section.settings.general-settings.no-animate.expanded#js-general-settings @@ -39,7 +39,7 @@ = render Pajamas::AlertComponent.new(variant: :info, title: _('Merge requests and approvals settings have moved.'), alert_options: { class: 'js-merge-request-settings-callout gl-my-5', data: { feature_id: Users::CalloutsHelper::MERGE_REQUEST_SETTINGS_MOVED_CALLOUT, dismiss_endpoint: callouts_path, defer_links: 'true' } }) do |c| - = c.body do + - c.with_body do = _('On the left sidebar, select %{merge_requests_link} to view them.').html_safe % { merge_requests_link: link_to('Settings > Merge requests', project_settings_merge_requests_path(@project)).html_safe } = render_if_exists 'projects/settings/analytics', expanded: expanded diff --git a/app/views/projects/forks/error.html.haml b/app/views/projects/forks/error.html.haml index 022a96b15a7..cff5899b960 100644 --- a/app/views/projects/forks/error.html.haml +++ b/app/views/projects/forks/error.html.haml @@ -4,7 +4,7 @@ variant: :danger, alert_options: { class: 'gl-mt-5' }, dismissible: false) do |c| - = c.body do + - c.with_body do %p = _("You tried to fork %{link_to_the_project} but it failed for the following reason:").html_safe % { link_to_the_project: link_to_project(@project) } @@ -17,5 +17,5 @@ - else = error - = c.actions do + - c.with_actions do = link_to _('Try to fork again'), new_project_fork_path(@project), title: _("Fork"), class: "btn gl-alert-action btn-info btn-md gl-button" diff --git a/app/views/projects/imports/new.html.haml b/app/views/projects/imports/new.html.haml index efb364bd013..af337082141 100644 --- a/app/views/projects/imports/new.html.haml +++ b/app/views/projects/imports/new.html.haml @@ -9,7 +9,7 @@ dismissible: false, variant: :danger, alert_options: { class: 'gl-mb-5' }) do |c| - = c.body do + - c.with_body do = @project.import_state.last_error = gitlab_ui_form_for @project, url: project_import_path(@project), method: :post, html: { class: 'js-project-import' } do |f| diff --git a/app/views/projects/issues/service_desk/_alert_moved_from_service_desk.html.haml b/app/views/projects/issues/service_desk/_alert_moved_from_service_desk.html.haml index cc8d5bdaeec..b087a1d0151 100644 --- a/app/views/projects/issues/service_desk/_alert_moved_from_service_desk.html.haml +++ b/app/views/projects/issues/service_desk/_alert_moved_from_service_desk.html.haml @@ -4,5 +4,5 @@ = render Pajamas::AlertComponent.new(variant: :warning, alert_options: { class: 'hide js-alert-moved-from-service-desk-warning gl-mt-5' }) do |c| - = c.body do + - c.with_body do = s_('This project does not have %{service_desk_link_start}Service Desk%{service_desk_link_end} enabled, so the user who created the issue will no longer receive email notifications about new activity.').html_safe % { service_desk_link_start: service_desk_link_start, service_desk_link_end: '</a>'.html_safe } diff --git a/app/views/projects/mattermosts/new.html.haml b/app/views/projects/mattermosts/new.html.haml index 025ca1e1fd4..c73c256c1c3 100644 --- a/app/views/projects/mattermosts/new.html.haml +++ b/app/views/projects/mattermosts/new.html.haml @@ -5,7 +5,7 @@ - if @teams_error_message = render Pajamas::AlertComponent.new(variant: :danger) do |c| - = c.body do + - c.with_body do = @teams_error_message %h3 diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index e7510d6c4cb..9142893d400 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -4,7 +4,7 @@ = render Pajamas::CheckboxTagComponent.new(name: dom_id(merge_request, "selected"), value: nil, checkbox_options: { 'data-id' => merge_request.id }) do |c| - = c.label do + - c.with_label do %span.gl-sr-only = merge_request.title diff --git a/app/views/projects/merge_requests/_mr_title.html.haml b/app/views/projects/merge_requests/_mr_title.html.haml index aee746100ea..15339becb74 100644 --- a/app/views/projects/merge_requests/_mr_title.html.haml +++ b/app/views/projects/merge_requests/_mr_title.html.haml @@ -9,7 +9,7 @@ = render Pajamas::AlertComponent.new(alert_options: { class: 'gl-mb-5' }, variant: :danger, dismissible: false) do |c| - = c.body do + - c.with_body do = _('The source project of this merge request has been removed.') .detail-page-header.border-bottom-0.gl-display-block.gl-pt-5{ class: "gl-md-display-flex! #{'is-merge-request' if moved_mr_sidebar_enabled? && !fluid_layout}" } diff --git a/app/views/projects/merge_requests/invalid.html.haml b/app/views/projects/merge_requests/invalid.html.haml index 4596fcd280d..4ea33cbbd99 100644 --- a/app/views/projects/merge_requests/invalid.html.haml +++ b/app/views/projects/merge_requests/invalid.html.haml @@ -11,7 +11,7 @@ = render Pajamas::AlertComponent.new(variant: :danger, dismissible: false) do |c| - = c.body do + - c.with_body do - if @merge_request.for_fork? && !@merge_request.source_project = err_fork_project_removed - elsif !@merge_request.source_branch_exists? diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index 95ef856daba..36500e157b4 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -16,7 +16,7 @@ = render Pajamas::AlertComponent.new(dismissible: false, alert_options: { class: 'gl-mt-3 gl-mb-5', data: { testid: 'no-issues-alert' }}) do |c| - = c.body do + - c.with_body do = _('Assign some issues to this milestone.') - else = render 'shared/milestones/milestone_complete_alert', milestone: @milestone do diff --git a/app/views/projects/mirrors/_mirror_repos.html.haml b/app/views/projects/mirrors/_mirror_repos.html.haml index 4cfe463fa38..110bc8d82f8 100644 --- a/app/views/projects/mirrors/_mirror_repos.html.haml +++ b/app/views/projects/mirrors/_mirror_repos.html.haml @@ -33,7 +33,7 @@ = f.submit _('Mirror repository'), class: 'js-mirror-submit', name: :update_remote_mirror, pajamas_button: true, data: { qa_selector: 'mirror_repository_button' } - else = render Pajamas::AlertComponent.new(dismissible: false) do |c| - = c.body do + - c.with_body do = _('Mirror settings are only available to GitLab administrators.') = render 'projects/mirrors/mirror_repos_list' diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index 52ac8b58c9a..59a21cecd39 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -27,7 +27,7 @@ #create-from-template-pane.tab-pane = render Pajamas::CardComponent.new(card_options: { class: 'gl-my-5' }) do |c| - = c.body do + - c.with_body do %div - contributing_templates_url = 'https://gitlab.com/gitlab-org/project-templates/contributing' - link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: contributing_templates_url } diff --git a/app/views/projects/pages_domains/_form.html.haml b/app/views/projects/pages_domains/_form.html.haml index 9d9603b0947..bca955dcdae 100644 --- a/app/views/projects/pages_domains/_form.html.haml +++ b/app/views/projects/pages_domains/_form.html.haml @@ -1,6 +1,6 @@ - if domain_presenter.errors.any? = render Pajamas::AlertComponent.new(variant: :danger, dismissible: false) do |c| - = c.body do + - c.with_body do - domain_presenter.errors.full_messages.each do |msg| = msg diff --git a/app/views/projects/pages_domains/show.html.haml b/app/views/projects/pages_domains/show.html.haml index 5de5188ae6a..89e64d607a6 100644 --- a/app/views/projects/pages_domains/show.html.haml +++ b/app/views/projects/pages_domains/show.html.haml @@ -7,7 +7,7 @@ - if verification_enabled && domain_presenter.unverified? = content_for :flash_message do = render Pajamas::AlertComponent.new(variant: :warning, dismissible: false) do |c| - = c.body do + - c.with_body do .container-fluid.container-limited = _("This domain is not verified. You will need to verify ownership before access is enabled.") diff --git a/app/views/projects/pipelines/show.html.haml b/app/views/projects/pipelines/show.html.haml index 15d729c89b9..a7d670f8475 100644 --- a/app/views/projects/pipelines/show.html.haml +++ b/app/views/projects/pipelines/show.html.haml @@ -21,7 +21,7 @@ variant: :danger, dismissible: false, alert_options: { class: 'gl-mb-5' }) do |c| - = c.body do + - c.with_body do %ul - @pipeline.yaml_errors.split("\n").each do |error| %li= error diff --git a/app/views/projects/settings/integrations/_form.html.haml b/app/views/projects/settings/integrations/_form.html.haml index 97d90976f18..39dfd410727 100644 --- a/app/views/projects/settings/integrations/_form.html.haml +++ b/app/views/projects/settings/integrations/_form.html.haml @@ -8,7 +8,7 @@ = render Pajamas::AlertComponent.new(title: s_('ExternalIssueIntegration|Another issue tracker is already in use'), variant: :warning, dismissible: false) do |c| - = c.body do + - c.with_body do = s_('ExternalIssueIntegration|Only one issue tracker integration can be active at a time. Please disable the active tracker first and try again.') - if integration.to_param === 'slack' diff --git a/app/views/projects/tags/new.html.haml b/app/views/projects/tags/new.html.haml index bd37a6258a2..1df323e7451 100644 --- a/app/views/projects/tags/new.html.haml +++ b/app/views/projects/tags/new.html.haml @@ -4,7 +4,7 @@ - if @error = render Pajamas::AlertComponent.new(variant: :danger, dismissible: true) do |c| - = c.body do + - c.with_body do = @error %h1.page-title.gl-font-size-h-display @@ -38,4 +38,3 @@ = s_('TagsPage|Create tag') = render Pajamas::ButtonComponent.new(href: project_tags_path(@project)) do = s_('TagsPage|Cancel') - diff --git a/app/views/projects/usage_quotas/index.html.haml b/app/views/projects/usage_quotas/index.html.haml index 1dd179f7b38..aad96151678 100644 --- a/app/views/projects/usage_quotas/index.html.haml +++ b/app/views/projects/usage_quotas/index.html.haml @@ -7,7 +7,7 @@ = render Pajamas::AlertComponent.new(title: _('Repository usage recalculation started'), variant: :info, alert_options: { class: 'js-recalculation-started-alert gl-mt-4 gl-mb-5 gl-display-none' }) do |c| - = c.body do + - c.with_body do = _('To view usage, refresh this page in a few minutes.') %h1.page-title.gl-font-size-h-display |