diff options
Diffstat (limited to 'app/views/groups')
18 files changed, 95 insertions, 77 deletions
diff --git a/app/views/groups/_delete_project_button.html.haml b/app/views/groups/_delete_project_button.html.haml new file mode 100644 index 00000000000..54a99319418 --- /dev/null +++ b/app/views/groups/_delete_project_button.html.haml @@ -0,0 +1 @@ += link_to _('Delete'), project, data: { confirm: remove_project_message(project) }, method: :delete, class: "btn gl-button btn-danger" diff --git a/app/views/groups/_home_panel.html.haml b/app/views/groups/_home_panel.html.haml index 624d0a21b81..b7c2b4d86b2 100644 --- a/app/views/groups/_home_panel.html.haml +++ b/app/views/groups/_home_panel.html.haml @@ -23,6 +23,10 @@ .home-panel-buttons.col-md-12.col-lg-6 - if current_user .gl-display-flex.gl-flex-wrap.gl-lg-justify-content-end.gl-mx-n2{ data: { testid: 'group-buttons' } } + - if current_user.admin? + = link_to [:admin, @group], class: 'btn btn-default gl-button btn-icon gl-mt-3 gl-mr-2', title: s_('View group in admin area'), + data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do + = sprite_icon('admin') - if @notification_setting .js-vue-notification-dropdown{ data: { disabled: emails_disabled.to_s, dropdown_items: notification_dropdown_items(@notification_setting).to_json, notification_level: @notification_setting.level, help_page_path: help_page_path('user/profile/notifications'), group_id: @group.id, container_class: 'gl-mx-2 gl-mt-3 gl-vertical-align-top' } } - if can_create_subgroups 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 c70cc2c4936..3bc2146b313 100644 --- a/app/views/groups/_import_group_from_file_panel.html.haml +++ b/app/views/groups/_import_group_from_file_panel.html.haml @@ -33,8 +33,7 @@ title: _('Please choose a group URL with no special characters.'), "data-bind-in" => "#{'create_chat_team' if Gitlab.config.mattermost.enabled}" %p.validation-error.gl-field-error.field-validation.hide - = _('Group path is already taken. Suggestions: ') - %span.gl-path-suggestions + = _("Group path is already taken. We've suggested one that is available.") %p.validation-success.gl-field-success.field-validation.hide= _('Group path is available.') %p.validation-pending.gl-field-error-ignore.field-validation.hide= _('Checking group path availability...') .form-group diff --git a/app/views/groups/_invite_members_modal.html.haml b/app/views/groups/_invite_members_modal.html.haml index f4f3c8ce8f7..3be1a142ca6 100644 --- a/app/views/groups/_invite_members_modal.html.haml +++ b/app/views/groups/_invite_members_modal.html.haml @@ -1,7 +1,8 @@ -- if can?(current_user, :admin_group_member, group) - .js-invite-members-modal{ data: { id: group.id, - name: group.name, - is_project: 'false', - access_levels: GroupMember.access_level_roles.to_json, - default_access_level: Gitlab::Access::GUEST, - help_link: help_page_url('user/permissions') }.merge(group_select_data(group)) } +- return unless can_manage_members?(group) + +.js-invite-members-modal{ data: { id: group.id, + name: group.name, + is_project: 'false', + access_levels: GroupMember.access_level_roles.to_json, + default_access_level: Gitlab::Access::GUEST, + help_link: help_page_url('user/permissions') }.merge(group_select_data(group)) } diff --git a/app/views/groups/_project_badges.html.haml b/app/views/groups/_project_badges.html.haml new file mode 100644 index 00000000000..1f7895e216c --- /dev/null +++ b/app/views/groups/_project_badges.html.haml @@ -0,0 +1,2 @@ +- if project.archived + %span.badge.badge-warning.badge-pill.gl-badge.md= _('archived') diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml index 33f836c2de0..ad916e3aeec 100644 --- a/app/views/groups/merge_requests.html.haml +++ b/app/views/groups/merge_requests.html.haml @@ -2,7 +2,7 @@ - page_title _("Merge requests") -- if @merge_requests&.size == 0 +- if issuables_count_for_state(:merge_requests, :all) == 0 = render 'shared/empty_states/merge_requests', project_select_button: true - else .top-area diff --git a/app/views/groups/milestones/_form.html.haml b/app/views/groups/milestones/_form.html.haml index 259e96901fd..a6302569187 100644 --- a/app/views/groups/milestones/_form.html.haml +++ b/app/views/groups/milestones/_form.html.haml @@ -1,25 +1,23 @@ = form_for [@group, @milestone], html: { class: 'milestone-form common-note-form js-quick-submit js-requires-input' } do |f| = form_errors(@milestone) - .row - .col-md-6 - .form-group.row - .col-form-label.col-sm-2 - = f.label :title, _("Title") - .col-sm-10 - = f.text_field :title, maxlength: 255, class: "form-control", data: { qa_selector: "milestone_title_field" }, required: true, autofocus: true - .form-group.row.milestone-description - .col-form-label.col-sm-2 - = f.label :description, _("Description") - .col-sm-10 - = render layout: 'shared/md_preview', locals: { url: group_preview_markdown_path } do - = render 'shared/zen', f: f, attr: :description, - classes: 'note-textarea', - qa_selector: 'milestone_description_field', - supports_autocomplete: true, - placeholder: _('Write milestone description...') - .clearfix - .error-alert - = render "shared/milestones/form_dates", f: f + .form-group.row + .col-form-label.col-sm-2 + = f.label :title, _("Title") + .col-sm-10 + = f.text_field :title, maxlength: 255, class: "form-control", data: { qa_selector: "milestone_title_field" }, required: true, autofocus: true + = render "shared/milestones/form_dates", f: f + .form-group.row.milestone-description + .col-form-label.col-sm-2 + = f.label :description, _("Description") + .col-sm-10 + = render layout: 'shared/md_preview', locals: { url: group_preview_markdown_path } do + = render 'shared/zen', f: f, attr: :description, + classes: 'note-textarea', + qa_selector: 'milestone_description_field', + supports_autocomplete: true, + placeholder: _('Write milestone description...') + .clearfix + .error-alert .form-actions - if @milestone.new_record? diff --git a/app/views/groups/projects.html.haml b/app/views/groups/projects.html.haml index 9d595d19779..9dbf60b119c 100644 --- a/app/views/groups/projects.html.haml +++ b/app/views/groups/projects.html.haml @@ -15,13 +15,12 @@ .controls = link_to _('Members'), project_project_members_path(project), id: "edit_#{dom_id(project)}", class: "btn gl-button" = link_to _('Edit'), edit_project_path(project), id: "edit_#{dom_id(project)}", class: "btn gl-button" - = link_to _('Delete'), project, data: { confirm: remove_project_message(project)}, method: :delete, class: "btn gl-button btn-danger" + = render 'delete_project_button', project: project .stats %span.badge.badge-pill = storage_counter(project.statistics&.storage_size) - - if project.archived - %span.badge.badge-warning archived + = render 'project_badges', project: project .title = link_to(project_path(project)) do diff --git a/app/views/groups/runners/_group_runners.html.haml b/app/views/groups/runners/_group_runners.html.haml index 823d908c5e2..49e297ee13d 100644 --- a/app/views/groups/runners/_group_runners.html.haml +++ b/app/views/groups/runners/_group_runners.html.haml @@ -9,19 +9,24 @@ -# Proper policies should be implemented per -# https://gitlab.com/gitlab-org/gitlab-foss/issues/45894 -- if can?(current_user, :admin_pipeline, @group) - = render partial: 'ci/runner/how_to_setup_runner_automatically', - locals: { type: 'group', - clusters_path: group_clusters_path(@group) } - - if params[:ci_runner_templates] +.bs-callout.help-callout + - if can?(current_user, :admin_pipeline, @group) && valid_runner_registrars.include?('group') + = render partial: 'ci/runner/how_to_setup_runner_automatically', + locals: { type: 'group', + clusters_path: group_clusters_path(@group) } + - if params[:ci_runner_templates] + %hr + = render partial: 'ci/runner/setup_runner_in_aws', + locals: { registration_token: @group.runners_token } %hr - = render partial: 'ci/runner/setup_runner_in_aws', - locals: { registration_token: @group.runners_token } - %hr - = render partial: 'ci/runner/how_to_setup_runner', - locals: { registration_token: @group.runners_token, - type: 'group', - reset_token_url: reset_registration_token_group_settings_ci_cd_path, - project_path: '', - group_path: @group.full_path } - %br + = render partial: 'ci/runner/how_to_setup_runner', + locals: { registration_token: @group.runners_token, + type: 'group', + reset_token_url: reset_registration_token_group_settings_ci_cd_path, + project_path: '', + group_path: @group.full_path } + %br + - else + = _('Please contact an admin to register runners.') + = link_to _('Learn more.'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'runner-registration'), target: '_blank', rel: 'noopener noreferrer' + diff --git a/app/views/groups/runners/_runner.html.haml b/app/views/groups/runners/_runner.html.haml index 89e32c0999c..13da2292985 100644 --- a/app/views/groups/runners/_runner.html.haml +++ b/app/views/groups/runners/_runner.html.haml @@ -7,16 +7,16 @@ .table-mobile-content - if runner.group_type? %span.badge.badge-pill.gl-badge.sm.badge-success - = _('group') + = s_('Runners|group') - else %span.badge.badge-pill.gl-badge.sm.badge-info - = _('specific') + = s_('Runners|specific') - if runner.locked? %span.badge.badge-pill.gl-badge.sm.badge-warning - = _('locked') + = s_('Runners|locked') - unless runner.active? %span.badge.badge-pill.gl-badge.sm.badge-danger - = _('paused') + = s_('Runners|paused') .table-section.section-30 .table-mobile-header{ role: 'rowheader' }= s_('Runners|Runner') diff --git a/app/views/groups/runners/_index.html.haml b/app/views/groups/runners/_settings.html.haml index 187588f5f11..187588f5f11 100644 --- a/app/views/groups/runners/_index.html.haml +++ b/app/views/groups/runners/_settings.html.haml diff --git a/app/views/groups/settings/_advanced.html.haml b/app/views/groups/settings/_advanced.html.haml index d7a145924de..fea0736ffc8 100644 --- a/app/views/groups/settings/_advanced.html.haml +++ b/app/views/groups/settings/_advanced.html.haml @@ -24,21 +24,6 @@ "data-bind-in" => "#{'create_chat_team' if Gitlab.config.mattermost.enabled}" = f.submit s_('GroupSettings|Change group URL'), class: 'btn gl-button btn-warning' -.sub-section - %h4.warning-title= s_('GroupSettings|Transfer group') - = form_for @group, url: transfer_group_path(@group), method: :put, html: { class: 'js-group-transfer-form' } do |f| - .form-group - = dropdown_tag('Select parent group', options: { toggle_class: 'js-groups-dropdown', title: 'Parent Group', filter: true, dropdown_class: 'dropdown-open-top dropdown-group-transfer', placeholder: 'Search groups', data: { data: parent_group_options(@group), qa_selector: 'select_group_dropdown' } }) - = hidden_field_tag 'new_parent_group_id' - - %ul - - side_effects_link_start = '<a href="https://docs.gitlab.com/ee/user/project/index.html#redirects-when-changing-repository-paths" target="_blank">'.html_safe - - warning_text = s_("GroupSettings|Be careful. Changing a group's parent can have unintended %{side_effects_link_start}side effects%{side_effects_link_end}.") % { side_effects_link_start: side_effects_link_start, side_effects_link_end: '</a>'.html_safe } - %li= warning_text.html_safe - %li= s_('GroupSettings|You can only transfer the group to a group you manage.') - %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 current visibility, visibility levels for subgroups and projects will be changed to match the new parent group's visibility.") - = f.submit s_('GroupSettings|Transfer group'), class: 'btn gl-button btn-warning', data: { qa_selector: "transfer_group_button" } - += render 'groups/settings/transfer', group: @group = render 'groups/settings/remove', group: @group = render_if_exists 'groups/settings/restore', group: @group diff --git a/app/views/groups/settings/_pages_settings.html.haml b/app/views/groups/settings/_pages_settings.html.haml index a7b1813e4f1..456e0b0f1d0 100644 --- a/app/views/groups/settings/_pages_settings.html.haml +++ b/app/views/groups/settings/_pages_settings.html.haml @@ -2,4 +2,4 @@ = render_if_exists 'shared/pages/max_pages_size_input', form: f .gl-mt-3 - = f.submit s_('GitLabPages|Save'), class: 'btn gl-button btn-confirm' + = f.submit s_('GitLabPages|Save changes'), class: 'btn gl-button btn-confirm' diff --git a/app/views/groups/settings/_transfer.html.haml b/app/views/groups/settings/_transfer.html.haml new file mode 100644 index 00000000000..1472ae42152 --- /dev/null +++ b/app/views/groups/settings/_transfer.html.haml @@ -0,0 +1,22 @@ +.sub-section + %h4.warning-title= s_('GroupSettings|Transfer group') + = form_for group, url: transfer_group_path(group), method: :put, html: { class: 'js-group-transfer-form' } do |f| + .form-group + = dropdown_tag('Select parent group', options: { toggle_class: 'js-groups-dropdown', title: 'Parent Group', filter: true, dropdown_class: 'dropdown-open-top dropdown-group-transfer', placeholder: 'Search groups', disabled: group.paid?, data: { data: parent_group_options(group), qa_selector: 'select_group_dropdown' } }) + = hidden_field_tag 'new_parent_group_id' + + %ul + - side_effects_link_start = '<a href="https://docs.gitlab.com/ee/user/project/index.html#redirects-when-changing-repository-paths" target="_blank">'.html_safe + - warning_text = s_("GroupSettings|Be careful. Changing a group's parent can have unintended %{side_effects_link_start}side effects%{side_effects_link_end}.") % { side_effects_link_start: side_effects_link_start, side_effects_link_end: '</a>'.html_safe } + %li= warning_text.html_safe + %li= s_('GroupSettings|You can only transfer the group to a group you manage.') + %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 current visibility, visibility levels for subgroups and projects will be changed to match the new parent group's visibility.") + + - if group.paid? + .gl-alert.gl-alert-info.gl-mb-5{ data: { testid: 'group-to-transfer-has-linked-subscription-alert' } } + = sprite_icon('information-o', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title') + .gl-alert-body + = html_escape(_("This group can't be transfered 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 } + + = f.submit s_('GroupSettings|Transfer group'), class: 'btn gl-button btn-warning', data: { qa_selector: "transfer_group_button" } diff --git a/app/views/groups/settings/ci_cd/show.html.haml b/app/views/groups/settings/ci_cd/show.html.haml index 3c6514b95b8..018dd4c424d 100644 --- a/app/views/groups/settings/ci_cd/show.html.haml +++ b/app/views/groups/settings/ci_cd/show.html.haml @@ -32,9 +32,9 @@ = expanded ? _('Collapse') : _('Expand') %p = _("Runners are processes that pick up and execute CI/CD jobs for GitLab.") - = link_to s_('How do I configure runners?'), help_page_path('ci/runners/README'), target: '_blank', rel: 'noopener noreferrer' + = link_to s_('How do I configure runners?'), help_page_path('ci/runners/index'), target: '_blank', rel: 'noopener noreferrer' .settings-content - = render 'groups/runners/index' + = render 'groups/runners/settings' %section.settings#auto-devops-settings.no-animate{ class: ('expanded' if expanded) } .settings-header diff --git a/app/views/groups/settings/integrations/index.html.haml b/app/views/groups/settings/integrations/index.html.haml index 7a81d53c085..1db8edb040b 100644 --- a/app/views/groups/settings/integrations/index.html.haml +++ b/app/views/groups/settings/integrations/index.html.haml @@ -1,9 +1,9 @@ -- breadcrumb_title _('Integrations') -- page_title _('Integrations') +- breadcrumb_title s_('Integrations|Group-level integration management') +- page_title s_('Integrations|Group-level integration management') - @content_class = 'limit-container-width' unless fluid_layout -%h3= s_('Integrations|Project integration management') +%h3= s_('Integrations|Group-level integration management') - integrations_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: integrations_help_page_path } -%p= s_("Integrations|GitLab administrators can set up integrations that all projects inherit and use by default. These integrations apply to all projects that don't already use custom settings. You can override custom settings for a group or project if the settings are necessary at that level. Learn more about %{integrations_link_start}project integration management%{link_end}.").html_safe % { integrations_link_start: integrations_link_start, link_end: "</a>".html_safe } +%p= s_("Integrations|GitLab administrators can set up integrations that all projects in a group inherit and use by default. These integrations apply to all projects that don't already use custom settings. You can override custom settings for a project if the settings are necessary at that level. Learn more about %{integrations_link_start}group-level integration management%{link_end}.").html_safe % { integrations_link_start: integrations_link_start, link_end: "</a>".html_safe } = render 'shared/integrations/index', integrations: @integrations diff --git a/app/views/groups/settings/repository/_initial_branch_name.html.haml b/app/views/groups/settings/repository/_initial_branch_name.html.haml index 23ac7d51e4f..5299c38576d 100644 --- a/app/views/groups/settings/repository/_initial_branch_name.html.haml +++ b/app/views/groups/settings/repository/_initial_branch_name.html.haml @@ -5,7 +5,7 @@ %button.gl-button.js-settings-toggle{ type: 'button' } = expanded_by_default? ? _('Collapse') : _('Expand') %p - = _('Set the default name of the initial branch when creating new repositories through the user interface.') + = s_('GroupSettings|The default name for the initial branch of new repositories created in the group.') .settings-content = form_for @group, url: group_path(@group, anchor: 'js-default-branch-name'), html: { class: 'fieldset-form' } do |f| = form_errors(@group) @@ -16,7 +16,7 @@ = f.label :default_branch_name, _('Default initial branch name'), class: 'label-light' = f.text_field :default_branch_name, value: group.namespace_settings&.default_branch_name, placeholder: Gitlab::DefaultBranch.value(object: @group), class: 'form-control' %span.form-text.text-muted - = (_("Changes affect new repositories only. If not specified, either the configured application-wide default or Git's default name %{branch_name_default} will be used.") % { branch_name_default: fallback_branch_name }).html_safe + = (s_("GroupSettings|If not specified at the group or instance level, the default is %{default_initial_branch_name}. Does not affect existing repositories.") % { default_initial_branch_name: fallback_branch_name }).html_safe = f.hidden_field :redirect_target, value: "repository_settings" = f.submit _('Save changes'), class: 'btn gl-button btn-confirm' diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index 628425bf463..76850f0a884 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -6,6 +6,8 @@ - if show_thanks_for_purchase_banner? = 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 + - if show_invite_banner?(@group) = content_for :group_invite_members_banner do .container-fluid.container-limited{ class: "gl-pb-2! gl-pt-6! #{@content_class}" } |