Add latest changes from gitlab-org/gitlab@master

5 files changed, 4 insertions, 19 deletions

diff --git a/app/views/layouts/group.html.haml b/app/views/layouts/group.html.haml
index 67809cbc608..5a043704b76 100644
--- a/app/views/layouts/group.html.haml
+++ b/app/views/layouts/group.html.haml
@@ -6,7 +6,7 @@
 - @left_sidebar = true
 
 - content_for :flash_message do
-  = render "layouts/header/storage_enforcement_banner", context: @group
+  = dispensable_render_if_exists "groups/storage_enforcement_alert", context: @group
   = dispensable_render_if_exists "shared/namespace_storage_limit_alert", context: @group
 
 - content_for :page_specific_javascripts do
diff --git a/app/views/layouts/header/_storage_enforcement_banner.html.haml b/app/views/layouts/header/_storage_enforcement_banner.html.haml
deleted file mode 100644
index 1f7060f8235..00000000000
--- a/app/views/layouts/header/_storage_enforcement_banner.html.haml
+++ /dev/null
@@ -1,15 +0,0 @@
-- return unless current_user
-- context = local_assigns.fetch(:context)
-- banner_info = storage_enforcement_banner_info(context)
-- return unless banner_info.present?
-
-= render Pajamas::AlertComponent.new(variant: :warning,
-  alert_options: { class: 'js-storage-enforcement-banner',
-                   data: { feature_id: banner_info[:callouts_feature_name],
-                           dismiss_endpoint: banner_info[:callouts_path],
-                           group_id: banner_info[:namespace_id],
-                           defer_links: "true" }}) do |c|
-  = c.body do
-    %p= banner_info[:text_paragraph_1]
-    %p= banner_info[:text_paragraph_2]
-    %p= banner_info[:text_paragraph_3]
diff --git a/app/views/layouts/profile.html.haml b/app/views/layouts/profile.html.haml
index 1ec839ef642..1b6e78b7b3d 100644
--- a/app/views/layouts/profile.html.haml
+++ b/app/views/layouts/profile.html.haml
@@ -7,7 +7,7 @@
 - enable_search_settings locals: { container_class: 'gl-my-5' }
 
 - content_for :flash_message do
-  = render "layouts/header/storage_enforcement_banner", context: current_user.namespace
+  = dispensable_render_if_exists "profiles/storage_enforcement_alert", context: current_user.namespace
   = dispensable_render_if_exists "shared/namespace_storage_limit_alert", context: current_user.namespace
 
 = render template: "layouts/application"
diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml
index 9e5819c5189..75d5e40011c 100644
--- a/app/views/layouts/project.html.haml
+++ b/app/views/layouts/project.html.haml
@@ -8,7 +8,7 @@
 - @content_class = [@content_class, project_classes(@project)].compact.join(" ")
 
 - content_for :flash_message do
-  = render "layouts/header/storage_enforcement_banner", context: @project
+  = dispensable_render_if_exists "projects/storage_enforcement_alert", context: @project
   = dispensable_render_if_exists "shared/namespace_storage_limit_alert", context: @project
 
 - content_for :project_javascripts do
diff --git a/app/views/projects/branch_rules/_show.html.haml b/app/views/projects/branch_rules/_show.html.haml
index af0e656d301..46665fdb450 100644
--- a/app/views/projects/branch_rules/_show.html.haml
+++ b/app/views/projects/branch_rules/_show.html.haml
@@ -9,4 +9,4 @@
       = _('Define rules for who can push, merge, and the required approvals for each branch.')
 
   .settings-content.gl-pr-0
-    #js-branch-rules
+    #js-branch-rules{ data: { project_path: @project.full_path } }