diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-20 14:18:08 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-20 14:18:08 +0300 |
commit | 5afcbe03ead9ada87621888a31a62652b10a7e4f (patch) | |
tree | 9918b67a0d0f0bafa6542e839a8be37adf73102d /app/views/groups | |
parent | c97c0201564848c1f53226fe19d71fdcc472f7d0 (diff) |
Add latest changes from gitlab-org/gitlab@16-4-stable-eev16.4.0-rc42
Diffstat (limited to 'app/views/groups')
-rw-r--r-- | app/views/groups/_import_group_from_another_instance_panel.html.haml | 16 | ||||
-rw-r--r-- | app/views/groups/dependency_proxies/show.html.haml | 1 | ||||
-rw-r--r-- | app/views/groups/edit.html.haml | 4 | ||||
-rw-r--r-- | app/views/groups/group_members/index.html.haml | 2 | ||||
-rw-r--r-- | app/views/groups/labels/edit.html.haml | 3 | ||||
-rw-r--r-- | app/views/groups/milestones/_form.html.haml | 2 | ||||
-rw-r--r-- | app/views/groups/settings/_permissions.html.haml | 2 | ||||
-rw-r--r-- | app/views/groups/settings/applications/index.html.haml | 2 | ||||
-rw-r--r-- | app/views/groups/work_items/index.html.haml | 2 | ||||
-rw-r--r-- | app/views/groups/work_items/show.html.haml | 1 |
10 files changed, 18 insertions, 17 deletions
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 8c2434ca4a0..c35bbce6ba7 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 @@ -13,10 +13,9 @@ = s_('GroupsNew|Importing groups by direct transfer is currently disabled.') - if current_user.admin? - - admin_link_start = '<a href="%{url}">'.html_safe % { url: general_admin_application_settings_path(anchor: 'js-visibility-settings') } - - admin_link_end = '</a>'.html_safe + - admin_link = link_to('', general_admin_application_settings_path(anchor: 'js-visibility-settings')) - = s_('GroupsNew|Please %{admin_link_start}enable it in the Admin settings%{admin_link_end}.').html_safe % { admin_link_start: admin_link_start, admin_link_end: admin_link_end } + = safe_format(s_('GroupsNew|Please %{admin_link_start}enable it in the Admin settings%{admin_link_end}.'), tag_pair(admin_link, :admin_link_start, :admin_link_end)) - else = s_('GroupsNew|Please ask your Administrator to enable it in the Admin settings.') @@ -25,9 +24,8 @@ = render Pajamas::AlertComponent.new(dismissible: false, variant: :warning) do |c| - 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 } + - docs_link = link_to('', help_page_path('user/group/import/index.md', anchor: 'migrated-group-items'), target: '_blank', rel: 'noopener noreferrer') + = safe_format(s_('GroupsNew|Not all group items are migrated. %{docs_link_start}What items are migrated%{docs_link_end}?'), tag_pair(docs_link, :docs_link_start, :docs_link_end)) %p.gl-mt-3 = s_('GroupsNew|Provide credentials for the source instance to import from. You can provide this instance as a source to move groups in this instance.') @@ -41,9 +39,9 @@ .form-group.gl-display-flex.gl-flex-direction-column = f.label :bulk_import_gitlab_access_token, s_('GroupsNew|Personal access token'), for: 'import_gitlab_token' .gl-font-weight-normal - - pat_link_start = '<a href="%{url}" target="_blank">'.html_safe % { url: help_page_path('user/profile/personal_access_tokens') } - - short_living_link_start = '<a href="%{url}" target="_blank">'.html_safe % { url: help_page_path('security/token_overview', anchor: 'security-considerations') } - = s_('GroupsNew|Create a token with %{code_start}api%{code_end} and %{code_start}read_repository%{code_end} scopes in the %{pat_link_start}user settings%{pat_link_end} of the source GitLab instance. For %{short_living_link_start}security reasons%{short_living_link_end}, set a short expiration date for the token. Keep in mind that large migrations take more time.').html_safe % { code_start: '<code>'.html_safe, code_end: '</code>'.html_safe, pat_link_start: pat_link_start, pat_link_end: '</a>'.html_safe, short_living_link_start: short_living_link_start, short_living_link_end: '</a>'.html_safe } + - pat_link = link_to('', help_page_path('user/profile/personal_access_tokens'), target: '_blank') + - short_living_link = link_to('', help_page_path('security/token_overview', anchor: 'security-considerations'), target: '_blank') + = safe_format(s_('GroupsNew|Create a token with %{code_start}api%{code_end} and %{code_start}read_repository%{code_end} scopes in the %{pat_link_start}user settings%{pat_link_end} of the source GitLab instance. For %{short_living_link_start}security reasons%{short_living_link_end}, set a short expiration date for the token. Keep in mind that large migrations take more time.'), tag_pair('<code></code>'.html_safe, :code_start , :code_end), tag_pair(pat_link, :pat_link_start, :pat_link_end), tag_pair(short_living_link, :short_living_link_start, :short_living_link_end)) = f.text_field :bulk_import_gitlab_access_token, placeholder: s_('GroupsNew|e.g. h8d3f016698e...'), class: 'gl-form-input gl-mt-3 col-xs-12 col-sm-8', required: true, disabled: bulk_imports_disabled, diff --git a/app/views/groups/dependency_proxies/show.html.haml b/app/views/groups/dependency_proxies/show.html.haml index 8416cb81c95..02a024ed3b5 100644 --- a/app/views/groups/dependency_proxies/show.html.haml +++ b/app/views/groups/dependency_proxies/show.html.haml @@ -1,6 +1,7 @@ - page_title _("Dependency Proxy") #js-dependency-proxy{ data: { group_path: @group.full_path, + endpoint: group_dependency_proxy_path(@group), no_manifests_illustration: image_path('illustrations/docker-empty-state.svg'), group_id: @group.id, settings_path: group_settings_packages_and_registries_path(@group), diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml index c11154cbd75..8d6eebc27b0 100644 --- a/app/views/groups/edit.html.haml +++ b/app/views/groups/edit.html.haml @@ -28,8 +28,8 @@ .settings-content = render 'groups/settings/permissions' -= render_if_exists 'groups/merge_requests', expanded: expanded, group: @group -= render_if_exists 'groups/merge_request_approval_settings', expanded: expanded, group: @group, user: current_user += render_if_exists 'groups/settings/merge_requests/merge_requests', expanded: expanded, group: @group += render_if_exists 'groups/settings/merge_requests/merge_request_approval_settings', expanded: expanded, group: @group, user: current_user = render_if_exists 'groups/analytics', expanded: expanded %section.settings.no-animate#js-badge-settings{ class: ('expanded' if expanded) } diff --git a/app/views/groups/group_members/index.html.haml b/app/views/groups/group_members/index.html.haml index e5c66c2c432..fbfaaa49b39 100644 --- a/app/views/groups/group_members/index.html.haml +++ b/app/views/groups/group_members/index.html.haml @@ -15,7 +15,7 @@ = render_if_exists 'groups/group_members/create_service_account' .js-invite-members-trigger{ data: { variant: 'confirm', classes: 'gl-md-w-auto gl-w-full', - trigger_source: 'group-members-page', + trigger_source: 'group_members_page', display_text: _('Invite members') } } = render 'groups/invite_groups_modal', group: @group, reload_page_on_submit: true diff --git a/app/views/groups/labels/edit.html.haml b/app/views/groups/labels/edit.html.haml index 9af842b01df..1a64ba0c27d 100644 --- a/app/views/groups/labels/edit.html.haml +++ b/app/views/groups/labels/edit.html.haml @@ -1,8 +1,9 @@ - add_to_breadcrumbs _("Labels"), group_labels_path(@group) - breadcrumb_title _("Edit") - page_title _("Edit"), @label.name, _("Labels") +- show_lock_on_merge = @group.supports_lock_on_merge? %h1.page-title.gl-font-size-h-display = _('Edit Label') -= render 'shared/labels/form', url: group_label_path(@group, @label), back_path: @previous_labels_path += render 'shared/labels/form', url: group_label_path(@group, @label), back_path: @previous_labels_path, show_lock_on_merge: show_lock_on_merge diff --git a/app/views/groups/milestones/_form.html.haml b/app/views/groups/milestones/_form.html.haml index e84fd7a8692..7665da08582 100644 --- a/app/views/groups/milestones/_form.html.haml +++ b/app/views/groups/milestones/_form.html.haml @@ -13,7 +13,7 @@ - @gfm_form = true .js-markdown-editor{ data: { render_markdown_path: group_preview_markdown_path, markdown_docs_path: help_page_path('user/markdown'), - qa_selector: 'milestone_description_field', + testid: 'milestone-description-field', form_field_placeholder: _('Write milestone description...'), supports_quick_actions: 'false', enable_autocomplete: 'true', diff --git a/app/views/groups/settings/_permissions.html.haml b/app/views/groups/settings/_permissions.html.haml index f4749617463..45fd98adbb9 100644 --- a/app/views/groups/settings/_permissions.html.haml +++ b/app/views/groups/settings/_permissions.html.haml @@ -37,7 +37,7 @@ = render_if_exists 'groups/settings/wiki', f: f, group: @group = render 'groups/settings/lfs', f: f = render_if_exists 'groups/settings/code_suggestions', f: f, group: @group - = render_if_exists 'groups/settings/ai_related_settings', f: f, group: @group + = render_if_exists 'groups/settings/experimental_settings', f: f, group: @group = render_if_exists 'groups/settings/ai_third_party_settings', f: f, group: @group = render 'groups/settings/git_access_protocols', f: f, group: @group = render 'groups/settings/project_creation_level', f: f, group: @group diff --git a/app/views/groups/settings/applications/index.html.haml b/app/views/groups/settings/applications/index.html.haml index da3257ca27d..595336d8abb 100644 --- a/app/views/groups/settings/applications/index.html.haml +++ b/app/views/groups/settings/applications/index.html.haml @@ -3,7 +3,7 @@ - @force_desktop_expanded_sidebar = true = render 'shared/doorkeeper/applications/index', - oauth_applications_enabled: user_oauth_applications?, + oauth_applications_enabled: true, oauth_authorized_applications_enabled: false, form_url: group_settings_applications_path(@group), application_url: ->(application) { group_settings_application_path(@group, application) }, diff --git a/app/views/groups/work_items/index.html.haml b/app/views/groups/work_items/index.html.haml index 2e3d3dda941..299a90b362d 100644 --- a/app/views/groups/work_items/index.html.haml +++ b/app/views/groups/work_items/index.html.haml @@ -1,4 +1,4 @@ - page_title s_('WorkItem|Work items') - add_page_specific_style 'page_bundles/issuable_list' -.js-work-items-list-root{ data: { full_path: @group.full_path } } +.js-work-items-list-root{ data: work_items_list_data(@group) } diff --git a/app/views/groups/work_items/show.html.haml b/app/views/groups/work_items/show.html.haml new file mode 100644 index 00000000000..eb962cc0b69 --- /dev/null +++ b/app/views/groups/work_items/show.html.haml @@ -0,0 +1 @@ +.h1 Work Item |