diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-20 11:43:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-20 11:43:02 +0300 |
commit | d9ab72d6080f594d0b3cae15f14b3ef2c6c638cb (patch) | |
tree | 2341ef426af70ad1e289c38036737e04b0aa5007 /app/views/groups | |
parent | d6e514dd13db8947884cd58fe2a9c2a063400a9b (diff) |
Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42
Diffstat (limited to 'app/views/groups')
-rw-r--r-- | app/views/groups/_group_admin_settings.html.haml | 2 | ||||
-rw-r--r-- | app/views/groups/_home_panel.html.haml | 12 | ||||
-rw-r--r-- | app/views/groups/_import_group_from_another_instance_panel.html.haml | 13 | ||||
-rw-r--r-- | app/views/groups/dependency_proxies/_url.html.haml | 12 | ||||
-rw-r--r-- | app/views/groups/dependency_proxies/show.html.haml | 31 | ||||
-rw-r--r-- | app/views/groups/edit.html.haml | 7 | ||||
-rw-r--r-- | app/views/groups/issues.html.haml | 2 | ||||
-rw-r--r-- | app/views/groups/registry/repositories/index.html.haml | 3 | ||||
-rw-r--r-- | app/views/groups/runners/_runner.html.haml | 2 | ||||
-rw-r--r-- | app/views/groups/settings/_general.html.haml | 3 | ||||
-rw-r--r-- | app/views/groups/settings/_lfs.html.haml | 4 | ||||
-rw-r--r-- | app/views/groups/settings/_permissions.html.haml | 6 | ||||
-rw-r--r-- | app/views/groups/settings/_two_factor_auth.html.haml | 10 | ||||
-rw-r--r-- | app/views/groups/settings/packages_and_registries/show.html.haml | 5 |
14 files changed, 41 insertions, 71 deletions
diff --git a/app/views/groups/_group_admin_settings.html.haml b/app/views/groups/_group_admin_settings.html.haml index ea191449fe3..ab6861b5f24 100644 --- a/app/views/groups/_group_admin_settings.html.haml +++ b/app/views/groups/_group_admin_settings.html.haml @@ -36,4 +36,4 @@ .offset-sm-2.col-sm-10 .form-check = f.text_field :two_factor_grace_period, class: 'form-control' - .form-text.text-muted= _("Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication") + .form-text.text-muted= _("Time (in hours) that users are allowed to skip forced configuration of two-factor authentication.") diff --git a/app/views/groups/_home_panel.html.haml b/app/views/groups/_home_panel.html.haml index 0352f366f5d..e530d9c60b6 100644 --- a/app/views/groups/_home_panel.html.haml +++ b/app/views/groups/_home_panel.html.haml @@ -5,17 +5,19 @@ .group-home-panel .row.mb-3 .home-panel-title-row.col-md-12.col-lg-6.d-flex - .avatar-container.rect-avatar.s64.home-panel-avatar.gl-mr-3.float-none + .avatar-container.rect-avatar.s64.home-panel-avatar.gl-flex-shrink-0.float-none{ class: 'gl-mr-3!' } = group_icon(@group, class: 'avatar avatar-tile s64', width: 64, height: 64, itemprop: 'logo') .d-flex.flex-column.flex-wrap.align-items-baseline .d-inline-flex.align-items-baseline - %h1.home-panel-title.gl-mt-3.gl-mb-2{ itemprop: 'name' } + %h1.home-panel-title.gl-mt-3.gl-mb-2.gl-ml-3{ itemprop: 'name' } = @group.name %span.visibility-icon.text-secondary.gl-ml-2.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@group) } = visibility_level_icon(@group.visibility_level, options: {class: 'icon'}) - .home-panel-metadata.text-secondary - %span - = _("Group ID: %{group_id}") % { group_id: @group.id } + .home-panel-metadata.text-secondary.gl-font-base.gl-font-weight-normal.gl-line-height-normal + - if can?(current_user, :read_group, @group) + - button_class = "btn gl-button btn-sm btn-tertiary btn-default-tertiary home-panel-metadata" + - button_text = s_('GroupPage|Group ID: %{group_id}') % { group_id: @group.id } + = clipboard_button(title: s_('GroupPage|Copy group ID'), text: @group.id, hide_button_icon: true, button_text: button_text, class: button_class, qa_selector: 'group_id_content', itemprop: 'identifier') - if current_user %span.gl-ml-3 = render 'shared/members/access_request_links', source: @group 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 2b9277c67e9..06a86c2465f 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 @@ -1,16 +1,15 @@ = form_with url: configure_import_bulk_imports_path, class: 'group-form gl-show-field-errors' do |f| .gl-border-l-solid.gl-border-r-solid.gl-border-gray-100.gl-border-1.gl-p-5 - %h4.gl-display-flex - = s_('GroupsNew|Import groups from another instance of GitLab') - %span.badge.badge-info.badge-pill.gl-badge.md.gl-ml-3 - = _('Beta') + .gl-display-flex.gl-align-items-center + %h4.gl-display-flex + = s_('GroupsNew|Import groups from another instance of GitLab') + = link_to _('History'), history_import_bulk_imports_path, class: 'gl-link gl-ml-auto' .gl-alert.gl-alert-warning{ role: 'alert' } = sprite_icon('warning', css_class: 'gl-icon s16 gl-alert-icon gl-alert-icon-no-title') .gl-alert-body - docs_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/group/import/index.md') } - - feedback_link_start = '<a href="https://gitlab.com/gitlab-org/gitlab/-/issues/284495" target="_blank" rel="noopener noreferrer">'.html_safe - - link_end = '</a>'.html_safe - = s_('GroupsNew|Not all related objects are migrated, as %{docs_link_start}described here%{docs_link_end}. Please %{feedback_link_start}leave feedback%{feedback_link_end} on this feature.').html_safe % { docs_link_start: docs_link_start, docs_link_end: link_end, feedback_link_start: feedback_link_start, feedback_link_end: link_end } + - docs_link_end = '</a>'.html_safe + = s_('GroupsNew|Not all related objects are migrated. %{docs_link_start}More info%{docs_link_end}.').html_safe % { docs_link_start: docs_link_start, docs_link_end: docs_link_end } %p.gl-mt-3 = s_('GroupsNew|Provide credentials for another instance of GitLab to import your groups directly.') .form-group.gl-display-flex.gl-flex-direction-column diff --git a/app/views/groups/dependency_proxies/_url.html.haml b/app/views/groups/dependency_proxies/_url.html.haml deleted file mode 100644 index 9a76da63a72..00000000000 --- a/app/views/groups/dependency_proxies/_url.html.haml +++ /dev/null @@ -1,12 +0,0 @@ -- proxy_url = @group.dependency_proxy_image_prefix - -%h5.prepend-top-20= _('Dependency proxy image prefix') - -.row - .col-lg-8.col-md-12.input-group - = text_field_tag :url, "#{proxy_url}", class: 'js-dependency-proxy-url form-control', readonly: true - = clipboard_button(text: "#{proxy_url}", title: _("Copy %{proxy_url}") % { proxy_url: proxy_url }) - -.row - .col-12.help-block.gl-mt-3{ data: { qa_selector: 'dependency_proxy_count' } } - = _('Contains %{count} blobs of images (%{size})') % { count: @blobs_count, size: number_to_human_size(@blobs_total_size) } diff --git a/app/views/groups/dependency_proxies/show.html.haml b/app/views/groups/dependency_proxies/show.html.haml index 177018af830..8936c4dcbb4 100644 --- a/app/views/groups/dependency_proxies/show.html.haml +++ b/app/views/groups/dependency_proxies/show.html.haml @@ -1,30 +1,5 @@ - page_title _("Dependency Proxy") +- dependency_proxy_available = Feature.enabled?(:dependency_proxy_for_private_groups, default_enabled: true) || @group.public? -.settings-header - %h4= _('Dependency proxy') - - %p - - link_start = '<a href="%{url}">'.html_safe % { url: help_page_path('user/packages/dependency_proxy/index') } - = _('Create a local proxy for storing frequently used upstream images. %{link_start}Learn more%{link_end} about dependency proxies.').html_safe % { link_start: link_start, link_end: '</a>'.html_safe } - -- if Feature.enabled?(:dependency_proxy_for_private_groups, default_enabled: true) || @group.public? - - if can?(current_user, :admin_dependency_proxy, @group) - = form_for(@dependency_proxy, method: :put, url: group_dependency_proxy_path(@group)) do |f| - .form-group - %h5.prepend-top-20= _('Enable proxy') - .js-dependency-proxy-toggle-area - = render "shared/buttons/project_feature_toggle", is_checked: @dependency_proxy.enabled?, label: s_("DependencyProxy|Toggle Dependency Proxy"), data: { qa_selector: 'dependency_proxy_setting_toggle' } do - = f.hidden_field :enabled, { class: 'js-project-feature-toggle-input'} - - - if @dependency_proxy.enabled - = render 'groups/dependency_proxies/url' - - - else - - if @dependency_proxy.enabled - = render 'groups/dependency_proxies/url' -- else - .gl-alert.gl-alert-info - .gl-alert-container - = sprite_icon('information-o', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title') - .gl-alert-content - = _('Dependency proxy feature is limited to public groups for now.') +#js-dependency-proxy{ data: { group_path: @group.full_path, + dependency_proxy_available: dependency_proxy_available.to_s } } diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml index 6e355d31204..420771257c9 100644 --- a/app/views/groups/edit.html.haml +++ b/app/views/groups/edit.html.haml @@ -1,5 +1,5 @@ -- breadcrumb_title _("General Settings") -- page_title _("General Settings") +- breadcrumb_title _("General settings") +- page_title _("General settings") - @content_class = "limit-container-width" unless fluid_layout - expanded = expanded_by_default? @@ -13,6 +13,7 @@ = _('Collapse') %p = _('Update your group name, description, avatar, and visibility.') + = link_to s_('Learn more about groups.'), help_page_path('user/group/index') .settings-content = render 'groups/settings/general' @@ -23,7 +24,7 @@ %button.btn.gl-button.js-settings-toggle{ type: 'button' } = expanded ? _('Collapse') : _('Expand') %p - = _('Advanced permissions, Large File Storage and Two-Factor authentication settings.') + = _('Configure advanced permissions, Large File Storage, and two-factor authentication settings.') .settings-content = render 'groups/settings/permissions' diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml index 1f746484b7d..0c6776a6038 100644 --- a/app/views/groups/issues.html.haml +++ b/app/views/groups/issues.html.haml @@ -6,7 +6,7 @@ = auto_discovery_link_tag(:atom, safe_params.merge(rss_url_options).to_h, title: "#{@group.name} issues") - if Feature.enabled?(:vue_issues_list, @group, default_enabled: :yaml) - .js-issues-list{ data: group_issues_list_data(@group, current_user, @issues) } + .js-issues-list{ data: group_issues_list_data(@group, current_user, @issues, @projects) } - if @can_bulk_update = render_if_exists 'shared/issuable/group_bulk_update_sidebar', group: @group, type: :issues - else diff --git a/app/views/groups/registry/repositories/index.html.haml b/app/views/groups/registry/repositories/index.html.haml index fa6bd021e45..2901c8fa46b 100644 --- a/app/views/groups/registry/repositories/index.html.haml +++ b/app/views/groups/registry/repositories/index.html.haml @@ -16,7 +16,8 @@ is_group_page: "true", "group_path": @group.full_path, "gid_prefix": container_repository_gid_prefix, - character_error: @character_error.to_s, + connection_error: (!!@connection_error).to_s, + invalid_path_error: (!!@invalid_path_error).to_s, user_callouts_path: user_callouts_path, user_callout_id: UserCalloutsHelper::UNFINISHED_TAG_CLEANUP_CALLOUT, show_unfinished_tag_cleanup_callout: show_unfinished_tag_cleanup_callout?.to_s } } diff --git a/app/views/groups/runners/_runner.html.haml b/app/views/groups/runners/_runner.html.haml index 66ffef98553..a76701ea5d2 100644 --- a/app/views/groups/runners/_runner.html.haml +++ b/app/views/groups/runners/_runner.html.haml @@ -39,7 +39,7 @@ - if runner.group_type? = _('n/a') - else - = runner.projects.count(:all) + = runner.runner_projects.count(:all) .table-section.section-5 .table-mobile-header{ role: 'rowheader' }= _('Jobs') diff --git a/app/views/groups/settings/_general.html.haml b/app/views/groups/settings/_general.html.haml index 7a2d5c91af6..ed76a9fe253 100644 --- a/app/views/groups/settings/_general.html.haml +++ b/app/views/groups/settings/_general.html.haml @@ -14,8 +14,9 @@ .row.gl-mt-3 .form-group.col-md-9 - = f.label :description, _('Group description (optional)'), class: 'label-bold' + = f.label :description, _('Group description'), class: 'label-bold' = f.text_area :description, class: 'form-control', rows: 3, maxlength: 250 + .form-text.text-muted= _('Optional.') = render_if_exists 'shared/repository_size_limit_setting', form: f, type: :group diff --git a/app/views/groups/settings/_lfs.html.haml b/app/views/groups/settings/_lfs.html.haml index 1255a2901ea..9f04b579a97 100644 --- a/app/views/groups/settings/_lfs.html.haml +++ b/app/views/groups/settings/_lfs.html.haml @@ -3,10 +3,10 @@ %h5= _('Large File Storage') -%p= s_('Check the %{docs_link_start}documentation%{docs_link_end}.').html_safe % { docs_link_start: docs_link_start, docs_link_end: '</a>'.html_safe } +%p= s_('%{docs_link_start}What is Large File Storage?%{docs_link_end}').html_safe % { docs_link_start: docs_link_start, docs_link_end: '</a>'.html_safe } .form-group.gl-mb-3 = f.gitlab_ui_checkbox_component :lfs_enabled, _('Allow projects within this group to use Git LFS'), - help_text: _('This setting can be overridden in each project.'), + help_text: _('Can be overridden in each project.'), checkbox_options: { checked: @group.lfs_enabled?, data: { qa_selector: 'lfs_checkbox' } } diff --git a/app/views/groups/settings/_permissions.html.haml b/app/views/groups/settings/_permissions.html.haml index 8f428909e60..eb38aa43881 100644 --- a/app/views/groups/settings/_permissions.html.haml +++ b/app/views/groups/settings/_permissions.html.haml @@ -7,7 +7,7 @@ - if @group.root? .form-group.gl-mb-3 = f.gitlab_ui_checkbox_component :prevent_sharing_groups_outside_hierarchy, - s_('GroupSettings|Prevent members from sending invitations to groups outside of %{group} and its subgroups.').html_safe % { group: link_to_group(@group) }, + s_('GroupSettings|Prevent members from sending invitations to groups outside of %{group} and its subgroups').html_safe % { group: link_to_group(@group) }, help_text: prevent_sharing_groups_outside_hierarchy_help_text(@group), checkbox_options: { disabled: !can_change_prevent_sharing_groups_outside_hierarchy?(@group) } @@ -21,13 +21,13 @@ = f.gitlab_ui_checkbox_component :emails_disabled, s_('GroupSettings|Disable email notifications'), checkbox_options: { checked: @group.emails_disabled?, disabled: !can_disable_group_emails?(@group) }, - help_text: s_('GroupSettings|This setting will override user notification preferences for all members of the group, subgroups, and projects.') + help_text: s_('GroupSettings|Overrides user notification preferences for all members of the group, subgroups, and projects.') .form-group.gl-mb-3 = f.gitlab_ui_checkbox_component :mentions_disabled, s_('GroupSettings|Disable group mentions'), checkbox_options: { checked: @group.mentions_disabled? }, - help_text: s_('GroupSettings|This setting will prevent group members from being notified if the group is mentioned.') + help_text: s_('GroupSettings|Prevents group members from being notified if the group is mentioned.') = render 'groups/settings/project_access_token_creation', f: f, group: @group = render_if_exists 'groups/settings/delayed_project_removal', f: f, group: @group diff --git a/app/views/groups/settings/_two_factor_auth.html.haml b/app/views/groups/settings/_two_factor_auth.html.haml index 8204cafcb44..f86bcb24e63 100644 --- a/app/views/groups/settings/_two_factor_auth.html.haml +++ b/app/views/groups/settings/_two_factor_auth.html.haml @@ -4,16 +4,16 @@ %h5= _('Two-factor authentication') -%p= s_('Check the %{docs_link_start}documentation%{docs_link_end}.').html_safe % { docs_link_start: docs_link_start, docs_link_end: '</a>'.html_safe } +%p= s_('%{docs_link_start}What is two-factor authentication?%{docs_link_end}').html_safe % { docs_link_start: docs_link_start, docs_link_end: '</a>'.html_safe } .form-group = f.gitlab_ui_checkbox_component :require_two_factor_authentication, - _('Require all users in this group to setup two-factor authentication'), + _('Require all users in this group to set up two-factor authentication'), checkbox_options: { data: { qa_selector: 'require_2fa_checkbox' } } .form-group - = f.label :two_factor_grace_period, _('Time before enforced'), class: 'label-bold' - = f.text_field :two_factor_grace_period, class: 'form-control form-control-sm w-auto' - .form-text.text-muted= _('Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication') + = f.label :two_factor_grace_period, _('Time before enforced') + = f.text_field :two_factor_grace_period, class: 'form-control form-control-sm w-auto gl-form-input gl-mb-3' + .form-text.text-muted= _('Time (in hours) that users are allowed to skip forced configuration of two-factor authentication.') - unless group.has_parent? .form-group = f.gitlab_ui_checkbox_component :allow_mfa_for_subgroups, diff --git a/app/views/groups/settings/packages_and_registries/show.html.haml b/app/views/groups/settings/packages_and_registries/show.html.haml index 1a12ad4902b..7be6dc73c49 100644 --- a/app/views/groups/settings/packages_and_registries/show.html.haml +++ b/app/views/groups/settings/packages_and_registries/show.html.haml @@ -1,5 +1,8 @@ - breadcrumb_title _('Packages & Registries') - page_title _('Packages & Registries') - @content_class = 'limit-container-width' unless fluid_layout +- dependency_proxy_available = Feature.enabled?(:dependency_proxy_for_private_groups, default_enabled: true) || @group.public? -%section#js-packages-and-registries-settings{ data: { default_expanded: expanded_by_default?.to_s, group_path: @group.full_path } } +%section#js-packages-and-registries-settings{ data: { default_expanded: expanded_by_default?.to_s, + group_path: @group.full_path, + dependency_proxy_available: dependency_proxy_available.to_s } } |