diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-09 12:14:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-09 12:14:13 +0300 |
commit | 6021fa2fc624b7d6902273bae55c5b8b2b2b3fff (patch) | |
tree | 54d044a94c33f737d46ecb4829930868fd79105e /app/views | |
parent | 377c02f959f45d07a6d1f3c4d7f5afc6ad5162ff (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/groups/_new_group_fields.html.haml | 18 | ||||
-rw-r--r-- | app/views/projects/activity.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/edit.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/labels/index.html.haml | 1 | ||||
-rw-r--r-- | app/views/projects/project_members/index.html.haml | 1 | ||||
-rw-r--r-- | app/views/projects/show.html.haml | 1 | ||||
-rw-r--r-- | app/views/projects/usage_quotas/index.html.haml | 2 |
7 files changed, 18 insertions, 9 deletions
diff --git a/app/views/groups/_new_group_fields.html.haml b/app/views/groups/_new_group_fields.html.haml index 4f5e235f06a..94b0b018084 100644 --- a/app/views/groups/_new_group_fields.html.haml +++ b/app/views/groups/_new_group_fields.html.haml @@ -3,16 +3,16 @@ = form_errors(@group) = render 'shared/groups/group_name_and_path_fields', f: f, autofocus: true, new_subgroup: !!parent -- unless parent - .row - .form-group.gl-form-group.col-sm-12 - %label.label-bold - = _('Visibility level') - %p - = _('Who will be able to see this group?') - = link_to _('View the documentation'), help_page_path("user/public_access"), target: '_blank', rel: 'noopener noreferrer' - = render 'shared/visibility_level', f: f, visibility_level: default_group_visibility, can_change_visibility_level: true, form_model: @group, with_label: false +.row + .form-group.gl-form-group.col-sm-12 + %label.label-bold + = _('Visibility level') + %p + = _('Who will be able to see this group?') + = link_to _('View the documentation'), help_page_path("user/public_access"), target: '_blank', rel: 'noopener noreferrer' + = render 'shared/visibility_level', f: f, visibility_level: default_group_visibility, can_change_visibility_level: true, form_model: @group, with_label: false +- unless parent - if Gitlab.config.mattermost.enabled .row = render 'create_chat_team', f: f diff --git a/app/views/projects/activity.html.haml b/app/views/projects/activity.html.haml index 6a4760c3954..674b21b66b9 100644 --- a/app/views/projects/activity.html.haml +++ b/app/views/projects/activity.html.haml @@ -1,4 +1,6 @@ - page_title _("Activity") += render_if_exists 'shared/ultimate_feature_removal_banner', project: @project + = render 'projects/last_push' = render 'projects/activity' diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index fda17284f83..70df995cdf3 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -5,6 +5,8 @@ - expanded = expanded_by_default? - reduce_visibility_form_id = 'reduce-visibility-form' += render_if_exists 'shared/ultimate_feature_removal_banner', project: @project + %section.settings.general-settings.no-animate.expanded#js-general-settings .settings-header %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only= _('Naming, topics, avatar') diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml index f7a02c521f5..f95689c0b1d 100644 --- a/app/views/projects/labels/index.html.haml +++ b/app/views/projects/labels/index.html.haml @@ -3,6 +3,7 @@ - search = params[:search] - subscribed = params[:subscribed] - labels_or_filters = @labels.exists? || @prioritized_labels.exists? || search.present? || subscribed.present? += render_if_exists 'shared/ultimate_feature_removal_banner', project: @project - if labels_or_filters #js-promote-label-modal diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml index 37fe80d2aaf..34305d15eff 100644 --- a/app/views/projects/project_members/index.html.haml +++ b/app/views/projects/project_members/index.html.haml @@ -2,6 +2,7 @@ - page_title _("Members") = render_if_exists 'projects/free_user_cap_alert', project: @project += render_if_exists 'shared/ultimate_feature_removal_banner', project: @project .row.gl-mt-3 .col-lg-12 diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index 1f529849b28..e9d1661a4f1 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -7,6 +7,7 @@ = auto_discovery_link_tag(:atom, project_path(@project, rss_url_options), title: "#{@project.name} activity") = render_if_exists 'projects/free_user_cap_alert', project: @project += render_if_exists 'shared/ultimate_feature_removal_banner', project: @project = render partial: 'flash_messages', locals: { project: @project } = render 'clusters_deprecation_alert' diff --git a/app/views/projects/usage_quotas/index.html.haml b/app/views/projects/usage_quotas/index.html.haml index b2c2394235a..5e2217d3c9f 100644 --- a/app/views/projects/usage_quotas/index.html.haml +++ b/app/views/projects/usage_quotas/index.html.haml @@ -1,5 +1,7 @@ - page_title s_("UsageQuota|Usage") += render_if_exists 'shared/ultimate_feature_removal_banner', project: @project + = 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| |