Automatic merge of gitlab-org/gitlab master

app/assets/javascripts/ide/components/merge_requests/list.vue

@@ -87,7 +87,7 @@ export default {
         @input="searchMergeRequests"
         @removeToken="setSearchType(null)"
       />
-      <gl-icon :size="18" name="search" class="ml-3 input-icon" use-deprecated-sizes />
+      <gl-icon :size="16" name="search" class="ml-3 input-icon" />
     </label>
     <div class="dropdown-content ide-merge-requests-dropdown-content d-flex">
       <gl-loading-icon
@@ -105,7 +105,7 @@ export default {
                 @click.stop="setSearchType(searchType)"
               >
                 <span class="d-flex gl-mr-3 ide-search-list-current-icon">
-                  <gl-icon :size="18" name="search" use-deprecated-sizes />
+                  <gl-icon :size="16" name="search" />
                 </span>
                 <span>{{ searchType.label }}</span>
               </button>

app/assets/javascripts/performance_bar/stores/performance_bar_store.js

@@ -47,10 +47,15 @@ export default class PerformanceBarStore {
   }
 
   canTrackRequest(requestUrl) {
-    return (
-      requestUrl.endsWith('/api/graphql') ||
-      this.requests.filter((request) => request.url === requestUrl).length < 2
-    );
+    // We want to store at most 2 unique requests per URL, as additional
+    // requests to the same URL probably aren't very interesting.
+    //
+    // GraphQL requests are the exception: because all GraphQL requests
+    // go to the same URL, we set a higher limit of 10 to allow
+    // capturing different queries a page may make.
+    const requestsLimit = requestUrl.endsWith('/api/graphql') ? 10 : 2;
+
+    return this.requests.filter((request) => request.url === requestUrl).length < requestsLimit;
   }
 
   static truncateUrl(requestUrl) {

app/models/concerns/cascading_namespace_setting_attribute.rb

@@ -25,7 +25,7 @@ module CascadingNamespaceSettingAttribute
 
   class_methods do
     def cascading_settings_feature_enabled?
-      ::Feature.enabled?(:cascading_namespace_settings, default_enabled: false)
+      ::Feature.enabled?(:cascading_namespace_settings, default_enabled: true)
     end
 
     private

changelogs/unreleased/dblessing_cascading_settings_default_enabled.yml

+---
+title: Default enable cascading settings feature flag
+merge_request: 59026
+author:
+type: changed

changelogs/unreleased/limit-graphql-requests-in-performance-bar.yml

+---
+title: Limit number of GraphQL requests tracked in performance bar to 10
+merge_request: 59158
+author:
+type: performance

config/feature_flags/development/cascading_namespace_settings.yml

 ---
 name: cascading_namespace_settings
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55678
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321724
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327230
 milestone: '13.11'
 type: development
 group: group::access
-default_enabled: false
+default_enabled: true

doc/ci/README.md

@@ -99,7 +99,7 @@ GitLab CI/CD uses a number of concepts to describe and run your build and deploy
 | [Cache dependencies](caching/index.md)                  | Cache your dependencies for a faster execution.                                |
 | [GitLab Runner](https://docs.gitlab.com/runner/)        | Configure your own runners to execute your scripts.                            |
 | [Pipeline efficiency](pipelines/pipeline_efficiency.md) | Configure your pipelines to run quickly and efficiently.                       |
-| [Test cases](test_cases/index.md) | Configure your pipelines to run quickly and efficiently.                       |
+| [Test cases](test_cases/index.md) | Configure your pipelines to run quickly and efficiently. <!--- this seems to be a duplicate description --->                      |
 
 ## Configuration
 

doc/user/packages/container_registry/index.md

@@ -4,7 +4,7 @@ group: Package
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
-# GitLab Container Registry
+# GitLab Container Registry **(FREE)**
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/4040) in GitLab 8.8.
 > - Docker Registry manifest `v1` support was added in GitLab 8.9 to support Docker

doc/user/packages/index.md

@@ -4,7 +4,7 @@ group: Package
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
-# Packages & Registries
+# Packages and Registries **(FREE)**
 
 The GitLab [Package Registry](package_registry/index.md) acts as a private or public registry
 for a variety of common package managers. You can publish and share

doc/user/packages/rubygems_registry/index.md

@@ -4,7 +4,7 @@ group: Package
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
-# Ruby gems in the Package Registry
+# Ruby gems in the Package Registry **(FREE)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/803) in [GitLab Free](https://about.gitlab.com/pricing/) 13.10.
 

doc/user/packages/workflows/project_registry.md

@@ -4,7 +4,7 @@ group: Package
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
-# Store all of your packages in one GitLab project
+# Store all of your packages in one GitLab project **(FREE)**
 
 You can store all of your packages in one project's Package Registry. Rather than using
 a GitLab repository to store code, you can use the repository to store all your packages.

doc/user/permissions.md

@@ -333,7 +333,7 @@ project and should only have access to that project.
 
 External users:
 
-- Cannot create projects (including forks), groups, or snippets.
+- Can only create projects (including forks), subgroups, and snippets within the top-level group to which they belong.
 - Can only access public projects and projects to which they are explicitly granted access,
   thus hiding all other internal or private ones from them (like being
   logged out).

spec/frontend/performance_bar/stores/performance_bar_store_spec.js

@@ -59,4 +59,44 @@ describe('PerformanceBarStore', () => {
       expect(store.findRequest('id').details.test.calls).toEqual(123);
     });
   });
+
+  describe('canTrackRequest', () => {
+    let store;
+
+    beforeEach(() => {
+      store = new PerformanceBarStore();
+    });
+
+    it('limits to 10 requests for GraphQL', () => {
+      expect(store.canTrackRequest('https://gitlab.com/api/graphql')).toBe(true);
+
+      store.addRequest('0', 'https://gitlab.com/api/graphql');
+      store.addRequest('1', 'https://gitlab.com/api/graphql');
+      store.addRequest('2', 'https://gitlab.com/api/graphql');
+      store.addRequest('3', 'https://gitlab.com/api/graphql');
+      store.addRequest('4', 'https://gitlab.com/api/graphql');
+      store.addRequest('5', 'https://gitlab.com/api/graphql');
+      store.addRequest('6', 'https://gitlab.com/api/graphql');
+      store.addRequest('7', 'https://gitlab.com/api/graphql');
+      store.addRequest('8', 'https://gitlab.com/api/graphql');
+
+      expect(store.canTrackRequest('https://gitlab.com/api/graphql')).toBe(true);
+
+      store.addRequest('9', 'https://gitlab.com/api/graphql');
+
+      expect(store.canTrackRequest('https://gitlab.com/api/graphql')).toBe(false);
+    });
+
+    it('limits to 2 requests for all other URLs', () => {
+      expect(store.canTrackRequest('https://gitlab.com/api/v4/users/1')).toBe(true);
+
+      store.addRequest('a', 'https://gitlab.com/api/v4/users/1');
+
+      expect(store.canTrackRequest('https://gitlab.com/api/v4/users/1')).toBe(true);
+
+      store.addRequest('b', 'https://gitlab.com/api/v4/users/1');
+
+      expect(store.canTrackRequest('https://gitlab.com/api/v4/users/1')).toBe(false);
+    });
+  });
 });