Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

1 files changed, 8 insertions, 0 deletions

diff --git a/qa/qa/page/project/settings/main.rb b/qa/qa/page/project/settings/main.rb
index 5efcb7bf23c..52ed630ac66 100644
--- a/qa/qa/page/project/settings/main.rb
+++ b/qa/qa/page/project/settings/main.rb
@@ -9,11 +9,13 @@ module QA
           include Component::Select2
           include SubMenus::Project
           include Component::Breadcrumbs
+          include Layout::Flash
 
           view 'app/views/projects/edit.html.haml' do
             element :advanced_settings_content
             element :merge_request_settings_content
             element :visibility_features_permissions_content
+            element :badges_settings_content
           end
 
           view 'app/views/projects/settings/_general.html.haml' do
@@ -51,6 +53,12 @@ module QA
               VisibilityFeaturesPermissions.perform(&block)
             end
           end
+
+          def expand_badges_settings(&block)
+            expand_content(:badges_settings_content) do
+              Component::Badges.perform(&block)
+            end
+          end
         end
       end
     end