diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
| commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
| tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/views/layouts/header | |
| parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) | |
| download | gitlab-ce-3cccd102ba543e02725d247893729e5c73b38295.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/views/layouts/header')
4 files changed, 11 insertions, 7 deletions
diff --git a/app/views/layouts/header/_current_user_dropdown.html.haml b/app/views/layouts/header/_current_user_dropdown.html.haml index daa48980c5b..11dd8ba6c08 100644 --- a/app/views/layouts/header/_current_user_dropdown.html.haml +++ b/app/views/layouts/header/_current_user_dropdown.html.haml @@ -27,7 +27,6 @@ %li = link_to s_("CurrentUser|Preferences"), profile_preferences_path = render_if_exists 'layouts/header/buy_pipeline_minutes', project: @project, namespace: @group - = render_if_exists 'layouts/header/upgrade' - if current_user_menu?(:help) %li.divider.d-md-none diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 512a4185bee..c15a5e54a42 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -40,7 +40,7 @@ - search_menu_item = top_nav_search_menu_item_attrs %li.nav-item.header-search-new.d-none.d-lg-block.m-auto - unless current_controller?(:search) - - if Feature.enabled?(:new_header_search) + - if Feature.enabled?(:new_header_search, default_enabled: :yaml) = render 'layouts/header_search' - else = render 'layouts/search' diff --git a/app/views/layouts/header/_registration_enabled_callout.html.haml b/app/views/layouts/header/_registration_enabled_callout.html.haml index d1d23c86c81..affee15c4d0 100644 --- a/app/views/layouts/header/_registration_enabled_callout.html.haml +++ b/app/views/layouts/header/_registration_enabled_callout.html.haml @@ -1,11 +1,11 @@ - return unless show_registration_enabled_user_callout? -= render 'shared/global_alert', - title: _('Anyone can register for an account.'), += render Pajamas::AlertComponent.new(title: _('Anyone can register for an account.'), variant: :warning, alert_class: 'js-registration-enabled-callout', - alert_data: { feature_id: Users::CalloutsHelper::REGISTRATION_ENABLED_CALLOUT, dismiss_endpoint: callouts_path }, - close_button_data: { testid: 'close-registration-enabled-callout' } do + alert_data: { feature_id: Users::CalloutsHelper::REGISTRATION_ENABLED_CALLOUT, + dismiss_endpoint: callouts_path }, + close_button_data: { testid: 'close-registration-enabled-callout' }) do .gl-alert-body = _('Only allow anyone to register for accounts on GitLab instances that you intend to be used by anyone. Allowing anyone to register makes GitLab instances more vulnerable.') .gl-alert-actions diff --git a/app/views/layouts/header/_storage_enforcement_banner.html.haml b/app/views/layouts/header/_storage_enforcement_banner.html.haml index 851fc57e44d..92c02d6ecfd 100644 --- a/app/views/layouts/header/_storage_enforcement_banner.html.haml +++ b/app/views/layouts/header/_storage_enforcement_banner.html.haml @@ -3,7 +3,12 @@ - banner_info = storage_enforcement_banner_info(namespace) - return unless banner_info.present? -= render 'shared/global_alert', variant: :warning, alert_class: 'js-storage-enforcement-banner', alert_data: { feature_id: banner_info[:callouts_feature_name], dismiss_endpoint: banner_info[:callouts_path], group_id: namespace.id, defer_links: "true" } do += render Pajamas::AlertComponent.new(variant: :warning, + alert_class: 'js-storage-enforcement-banner', + alert_data: { feature_id: banner_info[:callouts_feature_name], + dismiss_endpoint: banner_info[:callouts_path], + group_id: namespace.id, + defer_links: "true" }) do .gl-alert-body = banner_info[:text] = banner_info[:learn_more_link] |