diff options
Diffstat (limited to 'app/views/groups')
33 files changed, 85 insertions, 107 deletions
diff --git a/app/views/groups/_create_chat_team.html.haml b/app/views/groups/_create_chat_team.html.haml index 8f50d499605..45561031083 100644 --- a/app/views/groups/_create_chat_team.html.haml +++ b/app/views/groups/_create_chat_team.html.haml @@ -1,3 +1,6 @@ +- bind_out_tag = content_tag(:span, nil, { data: { bind_out: :create_chat_team } }) +- checkbox_help_text = "%s %s/%s".html_safe % [_('Mattermost URL:'), Settings.mattermost.host, bind_out_tag] + .form-group .col-sm-2.col-form-label = f.label :create_chat_team do @@ -5,13 +8,5 @@ = custom_icon('icon_mattermost') %span.gl-ml-2= _('Mattermost') .col-sm-12 - .form-check.js-toggle-container - .js-toggle-button.form-check-input= f.check_box(:create_chat_team, { checked: false }, true, false) - = f.label :create_chat_team, class: 'form-check-label' do - = _('Create a Mattermost team for this group') - %br - %small.light.js-toggle-content - = _('Mattermost URL:') - = Settings.mattermost.host - %span> / - %span{ "data-bind-out" => "create_chat_team" } + = f.gitlab_ui_checkbox_component :create_chat_team, _('Create a Mattermost team for this group'), help_text: checkbox_help_text, checkbox_options: { checked: false }, checked_value: true, unchecked_value: false + diff --git a/app/views/groups/_group_admin_settings.html.haml b/app/views/groups/_group_admin_settings.html.haml index 785ca71b371..0a170ebdb24 100644 --- a/app/views/groups/_group_admin_settings.html.haml +++ b/app/views/groups/_group_admin_settings.html.haml @@ -2,12 +2,12 @@ .col-sm-2.col-form-label.pt-0 = f.label :lfs_enabled, _('Large File Storage') .col-sm-10 - - label = _('Allow projects within this group to use Git LFS') - - help_link = link_to sprite_icon('question-o'), help_page_path('topics/git/lfs/index'), class: 'gl-ml-2' - = f.gitlab_ui_checkbox_component :lfs_enabled, - '%{label}%{help_link}'.html_safe % { label: label, help_link: help_link }, - help_text: _('This setting can be overridden in each project.'), - checkbox_options: { checked: @group.lfs_enabled? } + = f.gitlab_ui_checkbox_component :lfs_enabled, checkbox_options: { checked: @group.lfs_enabled? } do |c| + = c.label do + = _('Allow projects within this group to use Git LFS') + = link_to sprite_icon('question-o'), help_page_path('topics/git/lfs/index'), class: 'gl-ml-2' + = c.help_text do + = _('This setting can be overridden in each project.') .form-group.row .col-sm-2.col-form-label = f.label s_('ProjectCreationLevel|Allowed to create projects') diff --git a/app/views/groups/_invite_members_side_nav_link.html.haml b/app/views/groups/_invite_members_side_nav_link.html.haml index 3046669b53b..978ef01984c 100644 --- a/app/views/groups/_invite_members_side_nav_link.html.haml +++ b/app/views/groups/_invite_members_side_nav_link.html.haml @@ -1,7 +1,8 @@ .js-invite-members-trigger{ data: { trigger_source: 'group-side-nav', icon: 'users', display_text: title, - trigger_element: 'side-nav'} } + trigger_element: 'side-nav', + qa_selector: 'invite_members_sidebar_button' } } = render partial: 'shared/nav/sidebar_submenu', locals: { sidebar_menu: sidebar_menu } = render 'groups/invite_members_modal', group: group diff --git a/app/views/groups/_new_group_fields.html.haml b/app/views/groups/_new_group_fields.html.haml index fe2ee62d9be..83211505f36 100644 --- a/app/views/groups/_new_group_fields.html.haml +++ b/app/views/groups/_new_group_fields.html.haml @@ -1,4 +1,4 @@ -= form_errors(@group) += form_errors(@group, pajamas_alert: true) = render 'shared/group_form', f: f, autofocus: true .row diff --git a/app/views/groups/_personalize.html.haml b/app/views/groups/_personalize.html.haml index 07b3b29c20c..bae76952ef8 100644 --- a/app/views/groups/_personalize.html.haml +++ b/app/views/groups/_personalize.html.haml @@ -15,11 +15,9 @@ = f.label :setup_for_company, _('Who will be using this group?') .gl-display-flex.gl-flex-direction-column.gl-lg-flex-direction-row .gl-flex-grow-1.gl-display-flex.gl-align-items-center - = f.radio_button :setup_for_company, true - = f.label :setup_for_company, _('My company or team'), class: 'gl-font-weight-normal gl-mb-0 gl-ml-2', value: 'true' + = f.gitlab_ui_radio_component :setup_for_company, true, _('My company or team') .gl-flex-grow-1.gl-display-flex.gl-align-items-center - = f.radio_button :setup_for_company, false - = f.label :setup_for_company, _('Just me'), class: 'gl-font-weight-normal gl-mb-0 gl-ml-2', value: 'false' + = f.gitlab_ui_radio_component :setup_for_company, false, _('Just me') .row .form-group.col-sm-4 diff --git a/app/views/groups/_subgroups_and_projects.html.haml b/app/views/groups/_subgroups_and_projects.html.haml index 427a36aaec4..dc749af3c0c 100644 --- a/app/views/groups/_subgroups_and_projects.html.haml +++ b/app/views/groups/_subgroups_and_projects.html.haml @@ -1,7 +1,4 @@ #js-groups-subgroups_and_projects-tree - .empty-state.hidden - = render "shared/groups/empty_state" - %section{ data: { hide_projects: 'false', group_id: group.id, path: group_path(group) } } - .js-groups-list-holder{ data: { show_schema_markup: 'true'} } + .js-groups-list-holder{ data: subgroups_and_projects_list_app_data(group) } = gl_loading_icon(size: 'md', css_class: 'gl-mt-6') diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml index 3dcc75ce8f4..bca1c874cc6 100644 --- a/app/views/groups/edit.html.haml +++ b/app/views/groups/edit.html.haml @@ -4,13 +4,12 @@ - expanded = expanded_by_default? = render 'shared/namespaces/cascading_settings/lock_popovers' -= render_if_exists 'shared/minute_limit_banner', namespace: @group %section.settings.gs-general.no-animate.expanded#js-general-settings .settings-header %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only{ role: 'button' } = _('Naming, visibility') - %button.btn.gl-button.js-settings-toggle{ type: 'button' } + = render Pajamas::ButtonComponent.new(button_options: { class: 'js-settings-toggle' }) do = _('Collapse') %p = _('Update your group name, description, avatar, and visibility.') @@ -22,7 +21,7 @@ .settings-header %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only{ role: 'button' } = _('Permissions and group features') - %button.btn.gl-button.js-settings-toggle{ type: 'button' } + = render Pajamas::ButtonComponent.new(button_options: { class: 'js-settings-toggle' }) do = expanded ? _('Collapse') : _('Expand') %p = _('Configure advanced permissions, Large File Storage, two-factor authentication, and customer relations settings.') @@ -36,7 +35,7 @@ .settings-header %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only{ role: 'button' } = s_('GroupSettings|Badges') - %button.btn.gl-button.js-settings-toggle{ type: 'button' } + = render Pajamas::ButtonComponent.new(button_options: { class: 'js-settings-toggle' }) do = expanded ? _('Collapse') : _('Expand') %p = s_('GroupSettings|Customize this group\'s badges.') @@ -52,7 +51,7 @@ .settings-header %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only{ role: 'button' } = _('Advanced') - %button.btn.gl-button.js-settings-toggle{ type: 'button' } + = render Pajamas::ButtonComponent.new(button_options: { class: 'js-settings-toggle' }) do = expanded ? _('Collapse') : _('Expand') %p = _('Perform advanced options such as changing path, transferring, exporting, or removing the group.') diff --git a/app/views/groups/group_members/index.html.haml b/app/views/groups/group_members/index.html.haml index 9aa626724a8..635a74d8179 100644 --- a/app/views/groups/group_members/index.html.haml +++ b/app/views/groups/group_members/index.html.haml @@ -1,7 +1,7 @@ - add_page_specific_style 'page_bundles/members' - page_title _('Group members') -= render_if_exists 'shared/user_over_limit_free_plan_alert', source: @group += render_if_exists 'shared/free_user_cap_alert', source: @group .row.gl-mt-3 .col-lg-12 @@ -11,7 +11,7 @@ %h4 = _('Group members') %p - = html_escape(_('You can invite a new member to %{strong_start}%{group_name}%{strong_end}.')) % { group_name: @group.name, strong_start: '<strong>'.html_safe, strong_end: '</strong>'.html_safe } + = group_member_header_subtext(@group) .gl-w-half.gl-xs-w-full .gl-display-flex.gl-flex-wrap.gl-justify-content-end.gl-mb-3 .js-invite-group-trigger{ data: { classes: 'gl-mt-3 gl-sm-w-auto gl-w-full', display_text: _('Invite a group') } } diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml index 209faa937dc..925e7d46f14 100644 --- a/app/views/groups/issues.html.haml +++ b/app/views/groups/issues.html.haml @@ -1,28 +1,8 @@ -- @can_bulk_update = can?(current_user, :admin_issue, @group) && @group.licensed_feature_available?(:group_bulk_edit) - -- page_title _("Issues") +- page_title _('Issues') - add_page_specific_style 'page_bundles/issues_list' = content_for :meta_tags do = auto_discovery_link_tag(:atom, safe_params.merge(rss_url_options).to_h, title: "#{@group.name} issues") -- if Feature.enabled?(:vue_issues_list, @group) - .js-issues-list{ data: group_issues_list_data(@group, current_user) } - - if @can_bulk_update - = render_if_exists 'shared/issuable/group_bulk_update_sidebar', group: @group, type: :issues -- else - .top-area - = render 'shared/issuable/nav', type: :issues - .nav-controls - = render 'shared/issuable/feed_buttons' - - - if @can_bulk_update - = render_if_exists 'shared/issuable/bulk_update_button', type: :issues - - = render 'shared/new_project_item_select', path: 'issues/new', label: _("issue"), type: :issues, with_feature_enabled: 'issues', with_shared: false, include_projects_in_subgroups: true - - = render 'shared/issuable/search_bar', type: :issues - - - if @can_bulk_update - = render_if_exists 'shared/issuable/group_bulk_update_sidebar', group: @group, type: :issues - - = render 'shared/issues', project_select_button: true +.js-issues-list{ data: group_issues_list_data(@group, current_user) } +- if can?(current_user, :admin_issue, @group) && @group.licensed_feature_available?(:group_bulk_edit) + = render_if_exists 'shared/issuable/group_bulk_update_sidebar', group: @group, type: :issues diff --git a/app/views/groups/labels/edit.html.haml b/app/views/groups/labels/edit.html.haml index d9b8f99ea0c..9af842b01df 100644 --- a/app/views/groups/labels/edit.html.haml +++ b/app/views/groups/labels/edit.html.haml @@ -2,8 +2,7 @@ - breadcrumb_title _("Edit") - page_title _("Edit"), @label.name, _("Labels") -%h3.page-title +%h1.page-title.gl-font-size-h-display = _('Edit Label') -%hr = render 'shared/labels/form', url: group_label_path(@group, @label), back_path: @previous_labels_path diff --git a/app/views/groups/labels/index.html.haml b/app/views/groups/labels/index.html.haml index c480123dad1..8187dda5471 100644 --- a/app/views/groups/labels/index.html.haml +++ b/app/views/groups/labels/index.html.haml @@ -8,13 +8,13 @@ #js-promote-label-modal = render 'shared/labels/nav', labels_or_filters: labels_or_filters, can_admin_label: can_admin_label - .labels-container.gl-mt-2.gl-bg-gray-10.gl-border-solid.gl-border-1.gl-border-gray-100 + .labels-container.gl-mt-5 - if @labels.any? - .text-muted + .text-muted.gl-mb-5 = _('Labels can be applied to %{features}. Group labels are available for any project within the group.') % { features: issuable_types.to_sentence } .other-labels - %h5= _('Labels') - %ul.content-list.manage-labels-list.js-other-labels + %h4= _('Labels') + %ul.manage-labels-list.js-other-labels = render partial: 'shared/label', collection: @labels, as: :label, locals: { use_label_priority: false, subject: @group } = paginate @labels, theme: 'gitlab' - elsif search.present? diff --git a/app/views/groups/labels/new.html.haml b/app/views/groups/labels/new.html.haml index 75b4ad5c795..fd9aae987d4 100644 --- a/app/views/groups/labels/new.html.haml +++ b/app/views/groups/labels/new.html.haml @@ -2,8 +2,7 @@ - breadcrumb_title _("New") - page_title _("New Label") -%h3.page-title +%h1.page-title.gl-font-size-h-display = _('New Label') -%hr = render 'shared/labels/form', url: group_labels_path, back_path: @previous_labels_path diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml index 011c76e5ae7..b33d1443706 100644 --- a/app/views/groups/merge_requests.html.haml +++ b/app/views/groups/merge_requests.html.haml @@ -10,7 +10,7 @@ - if current_user .nav-controls - if @can_bulk_update - = render_if_exists 'shared/issuable/bulk_update_button', type: :merge_requests + = render_if_exists 'projects/merge_requests/bulk_update_button' = render 'shared/new_project_item_select', path: 'merge_requests/new', label: _("merge request"), type: :merge_requests, with_feature_enabled: 'merge_requests', with_shared: false, include_projects_in_subgroups: true diff --git a/app/views/groups/milestones/_form.html.haml b/app/views/groups/milestones/_form.html.haml index a6302569187..7da5a9e9664 100644 --- a/app/views/groups/milestones/_form.html.haml +++ b/app/views/groups/milestones/_form.html.haml @@ -1,5 +1,5 @@ = form_for [@group, @milestone], html: { class: 'milestone-form common-note-form js-quick-submit js-requires-input' } do |f| - = form_errors(@milestone) + = form_errors(@milestone, pajamas_alert: true) .form-group.row .col-form-label.col-sm-2 = f.label :title, _("Title") diff --git a/app/views/groups/milestones/edit.html.haml b/app/views/groups/milestones/edit.html.haml index 187c2d24b56..931d73715d3 100644 --- a/app/views/groups/milestones/edit.html.haml +++ b/app/views/groups/milestones/edit.html.haml @@ -3,7 +3,7 @@ - render "header_title" -%h3.page-title +%h1.page-title.gl-font-size-h-display = _('Edit Milestone') %hr diff --git a/app/views/groups/milestones/new.html.haml b/app/views/groups/milestones/new.html.haml index 0d4565706d4..8bceb1ddd5c 100644 --- a/app/views/groups/milestones/new.html.haml +++ b/app/views/groups/milestones/new.html.haml @@ -2,7 +2,7 @@ - breadcrumb_title _("New") - page_title _("Milestones"), @milestone.name, _("Milestones") -%h3.page-title +%h1.page-title.gl-font-size-h-display = _("New Milestone") %hr diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml index 58a78a8adc1..3fb2b88dadd 100644 --- a/app/views/groups/new.html.haml +++ b/app/views/groups/new.html.haml @@ -10,7 +10,7 @@ .row{ 'v-cloak': true } #create-group-pane.tab-pane - = form_for @group, html: { class: 'group-form gl-show-field-errors gl-mt-3' } do |f| + = gitlab_ui_form_for @group, html: { class: 'group-form gl-show-field-errors gl-mt-3' } do |f| = render 'new_group_fields', f: f, group_name_id: 'create-group-name' #import-group-pane.tab-pane diff --git a/app/views/groups/projects.html.haml b/app/views/groups/projects.html.haml index 3507f4574ab..d5c22d9b1f2 100644 --- a/app/views/groups/projects.html.haml +++ b/app/views/groups/projects.html.haml @@ -1,5 +1,6 @@ - breadcrumb_title _("Projects") - page_title _("Projects") +- @content_class = "limit-container-width" unless fluid_layout .card.gl-mt-3 .card-header diff --git a/app/views/groups/runners/_settings.html.haml b/app/views/groups/runners/_settings.html.haml index 7716a2f125f..3e5ec3c26e2 100644 --- a/app/views/groups/runners/_settings.html.haml +++ b/app/views/groups/runners/_settings.html.haml @@ -1,14 +1,12 @@ -.gl-mb-6 +.gl-mb-5 #update-shared-runners-form{ data: group_shared_runners_settings_data(@group) } -.gl-card.gl-px-8.gl-py-6.gl-line-height-20 - .gl-card-body.gl-display-flex{ :class => "gl-p-0!" } - .gl-banner-illustration - = image_tag('illustrations/rocket-launch-md.svg', alt: s_('Runners|Rocket launch illustration')) - .gl-banner-content - %h1.gl-banner-title - = s_('Runners|New group runners view') - %p - = s_('Runners|The new view gives you more space and better visibility into your fleet of runners.') - %a.btn.btn-confirm.btn-md.gl-button{ :href => group_runners_path(@group) } - %span.gl-button-text - = s_('Runners|Take me there!') +- if @group.licensed_feature_available?(:stale_runner_cleanup_for_namespace) + .gl-mb-5 + #stale-runner-cleanup-form{ data: { group_full_path: @group.full_path, stale_timeout_secs: ::Ci::Runner::STALE_TIMEOUT.to_i } } += render Pajamas::BannerComponent.new(button_text: s_('Runners|Take me there!'), + button_link: group_runners_path(@group), + svg_path: 'illustrations/rocket-launch-md.svg', + close_options: { class: 'gl-display-none' }) do |c| + - c.title do + = s_('Runners|New group runners view') + %p= s_('Runners|The new view gives you more space and better visibility into your fleet of runners.') diff --git a/app/views/groups/runners/edit.html.haml b/app/views/groups/runners/edit.html.haml index 04b9d88723f..c5999317597 100644 --- a/app/views/groups/runners/edit.html.haml +++ b/app/views/groups/runners/edit.html.haml @@ -5,7 +5,7 @@ - add_to_breadcrumbs "#{@runner.short_sha}", group_runner_path(@group, @runner) -%h2.page-title +%h1.page-title.gl-font-size-h-display = s_('Runners|Runner #%{runner_id}' % { runner_id: @runner.id }) = render 'shared/runners/runner_type_badge', runner: @runner diff --git a/app/views/groups/runners/show.html.haml b/app/views/groups/runners/show.html.haml index b6c0c8a707f..5a9d2ca858e 100644 --- a/app/views/groups/runners/show.html.haml +++ b/app/views/groups/runners/show.html.haml @@ -1,3 +1,6 @@ - add_to_breadcrumbs _('Runners'), group_runners_path(@group) -= render 'shared/runners/runner_details', runner: @runner +- if Feature.enabled?(:group_runner_view_ui) + #js-group-runner-show{ data: {runner_id: @runner.id, runners_path: group_runners_path(@group)} } +- else + = render 'shared/runners/runner_details', runner: @runner diff --git a/app/views/groups/settings/_advanced.html.haml b/app/views/groups/settings/_advanced.html.haml index ebeec2ee95a..3624ff2bcb3 100644 --- a/app/views/groups/settings/_advanced.html.haml +++ b/app/views/groups/settings/_advanced.html.haml @@ -4,7 +4,7 @@ .sub-section %h4.warning-title= s_('GroupSettings|Change group URL') = form_for @group, html: { multipart: true, class: 'gl-show-field-errors' }, authenticity_token: true do |f| - = form_errors(@group) + = form_errors(@group, pajamas_alert: true) .form-group %p = s_("GroupSettings|Changing a group's URL can have unintended side effects.") @@ -23,7 +23,7 @@ title: group_url_error_message, maxlength: ::Namespace::URL_MAX_LENGTH, "data-bind-in" => "#{'create_chat_team' if Gitlab.config.mattermost.enabled}" - = f.submit s_('GroupSettings|Change group URL'), class: 'btn gl-button btn-warning' + = f.submit s_('GroupSettings|Change group URL'), class: 'btn gl-button btn-danger' = render 'groups/settings/transfer', group: @group = render 'groups/settings/remove', group: @group, remove_form_id: remove_form_id diff --git a/app/views/groups/settings/_export.html.haml b/app/views/groups/settings/_export.html.haml index 6cae416311e..66c1341fb15 100644 --- a/app/views/groups/settings/_export.html.haml +++ b/app/views/groups/settings/_export.html.haml @@ -3,7 +3,7 @@ .sub-section %h4= s_('GroupSettings|Export group') %p= _('Export this group with all related data.') - = render Pajamas::AlertComponent.new(variant: :warning, dismissible: false, alert_class: 'gl-mb-4') do |c| + = render Pajamas::AlertComponent.new(variant: :warning, dismissible: false, alert_options: { class: 'gl-mb-4' }) do |c| = c.body do - docs_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/group/import/index.md') } - docs_link_end = '</a>'.html_safe @@ -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 = link_to _('Learn more.'), help_page_path('user/group/settings/import_export.md'), target: '_blank', rel: 'noopener noreferrer' - = render Pajamas::AlertComponent.new(dismissible: false, alert_class: 'gl-mb-5') do |c| + = render Pajamas::AlertComponent.new(dismissible: false, alert_options: { class: 'gl-mb-5' }) do |c| = c.body do %p.gl-mb-0 %p= _('The following items will be exported:') diff --git a/app/views/groups/settings/_git_access_protocols.html.haml b/app/views/groups/settings/_git_access_protocols.html.haml new file mode 100644 index 00000000000..df798db79ad --- /dev/null +++ b/app/views/groups/settings/_git_access_protocols.html.haml @@ -0,0 +1,7 @@ +- if group.root? && Feature.enabled?(:group_level_git_protocol_control, group) + .form-group + = f.label s_('Enabled Git access protocols'), class: 'label-bold' + = f.select :enabled_git_access_protocol, options_for_select(enabled_git_access_protocol_options_for_group, group.enabled_git_access_protocol), {}, class: 'form-control', data: { qa_selector: 'enabled_git_access_protocol_dropdown' }, disabled: !::Gitlab::CurrentSettings.enabled_git_access_protocol.blank? + - if !::Gitlab::CurrentSettings.enabled_git_access_protocol.blank? + .form-text.text-muted + = _("This setting has been configured at the instance level and cannot be overridden per group") diff --git a/app/views/groups/settings/_permissions.html.haml b/app/views/groups/settings/_permissions.html.haml index ecb31b37fd3..319af7be22e 100644 --- a/app/views/groups/settings/_permissions.html.haml +++ b/app/views/groups/settings/_permissions.html.haml @@ -37,6 +37,7 @@ - if @group.licensed_feature_available?(:group_wikis) = render_if_exists 'groups/settings/wiki', f: f, group: @group = render 'groups/settings/lfs', f: f + = render 'groups/settings/git_access_protocols', f: f, group: @group = render 'groups/settings/project_creation_level', f: f, group: @group = render 'groups/settings/subgroup_creation_level', f: f, group: @group = render_if_exists 'groups/settings/prevent_forking', f: f, group: @group @@ -44,12 +45,11 @@ = render_if_exists 'groups/personal_access_token_expiration_policy', f: f, group: @group = render 'groups/settings/membership', f: f, group: @group - - if crm_feature_available?(@group) - %h5= _('Customer relations') - .form-group.gl-mb-3 - = f.gitlab_ui_checkbox_component :crm_enabled, - s_('GroupSettings|Enable customer relations'), - checkbox_options: { checked: @group.crm_enabled? }, - help_text: s_('GroupSettings|Allows creating organizations and contacts and associating them with issues.') + %h5= _('Customer relations') + .form-group.gl-mb-3 + = f.gitlab_ui_checkbox_component :crm_enabled, + s_('GroupSettings|Enable customer relations'), + checkbox_options: { checked: @group.crm_enabled? }, + help_text: s_('GroupSettings|Allows creating organizations and contacts and associating them with issues.') = f.submit _('Save changes'), class: 'btn gl-button btn-confirm gl-mt-3 js-dirty-submit', data: { qa_selector: 'save_permissions_changes_button' } diff --git a/app/views/groups/settings/_remove_button.html.haml b/app/views/groups/settings/_remove_button.html.haml index e765638953a..df978f3cb96 100644 --- a/app/views/groups/settings/_remove_button.html.haml +++ b/app/views/groups/settings/_remove_button.html.haml @@ -1,7 +1,7 @@ - remove_form_id = local_assigns.fetch(:remove_form_id, nil) - if group.paid? - = render Pajamas::AlertComponent.new(dismissible: false, alert_class: 'gl-mb-5', alert_data: { testid: 'group-has-linked-subscription-alert' }) do |c| + = render Pajamas::AlertComponent.new(dismissible: false, alert_options: { class: 'gl-mb-5', data: { testid: 'group-has-linked-subscription-alert' }}) do |c| = c.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/index', anchor: 'change-the-linked-namespace')}\">".html_safe, linkEnd: '</a>'.html_safe } diff --git a/app/views/groups/settings/_transfer.html.haml b/app/views/groups/settings/_transfer.html.haml index e65c3cd13f6..e6c88977cb1 100644 --- a/app/views/groups/settings/_transfer.html.haml +++ b/app/views/groups/settings/_transfer.html.haml @@ -13,7 +13,7 @@ %li= s_('GroupSettings|You will need to update your local repositories to point to the new location.') %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_class: 'gl-mb-5') do |c| + = render Pajamas::AlertComponent.new(dismissible: false, alert_options: { class: 'gl-mb-5' }) do |c| = c.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/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/applications/edit.html.haml b/app/views/groups/settings/applications/edit.html.haml index cba4892eef9..ee71fd5d886 100644 --- a/app/views/groups/settings/applications/edit.html.haml +++ b/app/views/groups/settings/applications/edit.html.haml @@ -1,5 +1,5 @@ - page_title _("Edit"), @application.name, _("Group applications") - @content_class = "limit-container-width" unless fluid_layout -%h3.page-title= _('Edit group application') +%h1.page-title.gl-font-size-h-display= _('Edit group application') = render 'shared/doorkeeper/applications/form', url: group_settings_application_path(@group, @application) diff --git a/app/views/groups/settings/applications/show.html.haml b/app/views/groups/settings/applications/show.html.haml index 6e7f6ce4df0..4a83d96aae4 100644 --- a/app/views/groups/settings/applications/show.html.haml +++ b/app/views/groups/settings/applications/show.html.haml @@ -3,7 +3,7 @@ - page_title @application.name, _("Group applications") - @content_class = "limit-container-width" unless fluid_layout -%h3.page-title +%h1.page-title.gl-font-size-h-display = _("Group application: %{name}") % { name: @application.name } = render 'shared/doorkeeper/applications/show', diff --git a/app/views/groups/settings/ci_cd/show.html.haml b/app/views/groups/settings/ci_cd/show.html.haml index f6dda9358f3..3b117022d1e 100644 --- a/app/views/groups/settings/ci_cd/show.html.haml +++ b/app/views/groups/settings/ci_cd/show.html.haml @@ -3,7 +3,6 @@ - expanded = expanded_by_default? - general_expanded = @group.errors.empty? ? expanded : true -= render_if_exists 'shared/minute_limit_banner', namespace: @group -# Given we only have one field in this form which is also admin-only, -# we don't want to show an empty section to non-admin users, @@ -12,7 +11,7 @@ .settings-header %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only = _("General pipelines") - %button.btn.gl-button.js-settings-toggle{ type: 'button' } + = render Pajamas::ButtonComponent.new(button_options: { class: 'js-settings-toggle' }) do = expanded ? _('Collapse') : _('Expand') %p = _("Customize your pipeline configuration.") @@ -29,7 +28,7 @@ .settings-header %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only = _('Runners') - %button.btn.gl-button.btn-default.js-settings-toggle{ type: "button" } + = render Pajamas::ButtonComponent.new(button_options: { class: 'js-settings-toggle' }) do = expanded ? _('Collapse') : _('Expand') %p = _("Runners are processes that pick up and execute CI/CD jobs for GitLab.") @@ -41,7 +40,7 @@ .settings-header %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only = _('Auto DevOps') - %button.btn.gl-button.btn-default.js-settings-toggle{ type: "button" } + = render Pajamas::ButtonComponent.new(button_options: { class: 'js-settings-toggle' }) do = expanded ? _('Collapse') : _('Expand') %p - auto_devops_url = help_page_path('topics/autodevops/index') @@ -52,3 +51,5 @@ .settings-content = render 'groups/settings/ci_cd/auto_devops_form', group: @group + += render_if_exists 'groups/settings/ci_cd/protected_environments', expanded: expanded diff --git a/app/views/groups/settings/repository/_default_branch.html.haml b/app/views/groups/settings/repository/_default_branch.html.haml index f2644465a49..844a5f890a4 100644 --- a/app/views/groups/settings/repository/_default_branch.html.haml +++ b/app/views/groups/settings/repository/_default_branch.html.haml @@ -2,7 +2,7 @@ .settings-header %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only = _('Default branch') - %button.gl-button.js-settings-toggle{ type: 'button' } + = render Pajamas::ButtonComponent.new(button_options: { class: 'js-settings-toggle' }) do = expanded_by_default? ? _('Collapse') : _('Expand') %p = s_('GroupSettings|Set the initial name and protections for the default branch of new repositories created in the group.') diff --git a/app/views/groups/settings/repository/show.html.haml b/app/views/groups/settings/repository/show.html.haml index 072c8c4d821..d3b9117c05b 100644 --- a/app/views/groups/settings/repository/show.html.haml +++ b/app/views/groups/settings/repository/show.html.haml @@ -1,5 +1,6 @@ - breadcrumb_title _('Repository Settings') - page_title _('Repository') +- @content_class = "limit-container-width" unless fluid_layout - deploy_token_description = s_('DeployTokens|Group deploy tokens allow access to the packages, repositories, and registry images within the group.') diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index 7bbc2f839f7..3614d854036 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -7,8 +7,7 @@ = render_if_exists 'shared/thanks_for_purchase_banner', plan_title: plan_title, quantity: params[:purchased_quantity].to_i = render_if_exists 'shared/qrtly_reconciliation_alert', group: @group -= render_if_exists 'shared/user_over_limit_free_plan_alert', source: @group -= render_if_exists 'shared/minute_limit_banner', namespace: @group += render_if_exists 'shared/free_user_cap_alert', source: @group - if show_invite_banner?(@group) = content_for :group_invite_members_banner do |