Add latest changes from gitlab-org/gitlab@master

GITLAB_KAS_VERSION

@@ -1 +1 @@
-79d381bd3d4933427e3f3f08821b0e81310764d0
+835b8a2a7a181988190005711222666d1d27b921

doc/integration/advanced_search/elasticsearch.md

@@ -78,7 +78,8 @@ Advanced search works with the following versions of Elasticsearch.
 
 | GitLab version        | Elasticsearch version       |
 |-----------------------|-----------------------------|
-| GitLab 15.0 and later | Elasticsearch 7.x and 8.x   |
+| GitLab 18.1 and later | Elasticsearch 7.x and later |
+| GitLab 15.0 to 18.0   | Elasticsearch 7.x and 8.x   |
 | GitLab 14.0 to 14.10  | Elasticsearch 6.8 to 7.x    |
 
 Advanced search follows the [Elasticsearch end-of-life policy](https://www.elastic.co/support/eol).

spec/features/markdown/sandboxed_mermaid_spec.rb

@@ -75,7 +75,7 @@ RSpec.describe 'Sandboxed Mermaid rendering', :js, feature_category: :markdown d
       project.project_feature.update_attribute(:repository_access_level, ProjectFeature::DISABLED)
     end
 
-    it 'includes mermaid frame correctly' do
+    it 'includes mermaid frame correctly', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/553529' do
       visit(project_path(project))
 
       wait_for_requests

spec/frontend/vue_shared/gl_licensed_features_mixin_spec.js

@@ -1,7 +1,7 @@
 import { shallowMount } from '@vue/test-utils';
 import Vue from 'vue';
 import GlLicensedFeaturesPlugin from '~/vue_shared/gl_licensed_features_plugin';
-import glLicensedFeaturesMixin from '~/vue_shared/mixins/gl_licensed_feature_flags_mixin';
+import glLicensedFeaturesMixin from '~/vue_shared/mixins/gl_licensed_feature_mixin';
 
 describe('GitLab Licenced Feature Flags Plugin', () => {
   beforeEach(() => {

spec/helpers/invite_members_helper_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe InviteMembersHelper do
         help_link: help_page_url('user/permissions.md'),
         is_project: 'true',
         access_levels: ProjectMember.access_level_roles.to_json,
-        full_path: Gitlab.ee? ? project.root_ancestor.full_path : project.full_path
+        full_path: project.full_path
       }
 
       expect(helper.common_invite_group_modal_data(project, ProjectMember)).to include(attributes)
@@ -60,7 +60,7 @@ RSpec.describe InviteMembersHelper do
         root_id: project.root_ancestor.id,
         name: project.name,
         default_access_level: Gitlab::Access::GUEST,
-        full_path: Gitlab.ee? ? project.root_ancestor.full_path : project.full_path
+        full_path: project.full_path
       }
 
       expect(helper.common_invite_modal_dataset(project)).to include(attributes)