Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/work_items/index.js

@@ -42,6 +42,7 @@ export const initWorkItemsRoot = ({ workItemType, workspaceType, withTabs } = {}
     hasOkrsFeature,
     hasSubepicsFeature,
     hasIssuableHealthStatusFeature,
+    hasCustomFieldsFeature,
     newCommentTemplatePaths,
     reportAbusePath,
     defaultBranch,
@@ -113,6 +114,7 @@ export const initWorkItemsRoot = ({ workItemType, workspaceType, withTabs } = {}
       signInPath,
       hasIterationsFeature: parseBoolean(hasIterationsFeature),
       hasIssuableHealthStatusFeature: parseBoolean(hasIssuableHealthStatusFeature),
+      hasCustomFieldsFeature: parseBoolean(hasCustomFieldsFeature),
       reportAbusePath,
       groupPath,
       groupId,

app/assets/javascripts/work_items/pages/work_items_list_app.vue

@@ -82,6 +82,7 @@ import DateToken from '~/vue_shared/components/filtered_search_bar/tokens/date_t
 import IssuableList from '~/vue_shared/issuable/list/components/issuable_list_root.vue';
 import { DEFAULT_PAGE_SIZE, issuableListTabs } from '~/vue_shared/issuable/list/constants';
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
+import getWorkItemStateCountsQuery from 'ee_else_ce/work_items/graphql/list/get_work_item_state_counts.query.graphql';
 import CreateWorkItemModal from '../components/create_work_item_modal.vue';
 import WorkItemHealthStatus from '../components/work_item_health_status.vue';
 import WorkItemDrawer from '../components/work_item_drawer.vue';
@@ -97,7 +98,6 @@ import {
   WORK_ITEM_TYPE_NAME_KEY_RESULT,
   WORK_ITEM_TYPE_NAME_OBJECTIVE,
 } from '../constants';
-import getWorkItemStateCountsQuery from '../graphql/list/get_work_item_state_counts.query.graphql';
 import getWorkItemsQuery from '../graphql/list/get_work_items.query.graphql';
 import { sortOptions, urlSortParams } from './list/constants';
 
@@ -145,6 +145,7 @@ export default {
     'hasIssueDateFilterFeature',
     'hasOkrsFeature',
     'hasQualityManagementFeature',
+    'hasCustomFieldsFeature',
     'initialSort',
     'isGroup',
     'isSignedIn',
@@ -333,7 +334,9 @@ export default {
       return BASE_ALLOWED_CREATE_TYPES;
     },
     apiFilterParams() {
-      return convertToApiParams(this.filterTokens);
+      return convertToApiParams(this.filterTokens, {
+        hasCustomFieldsFeature: this.hasCustomFieldsFeature,
+      });
     },
     defaultWorkItemTypes() {
       return getDefaultWorkItemTypes({
@@ -611,7 +614,9 @@ export default {
       });
     },
     urlFilterParams() {
-      return convertToUrlParams(this.filterTokens);
+      return convertToUrlParams(this.filterTokens, {
+        hasCustomFieldsFeature: this.hasCustomFieldsFeature,
+      });
     },
     urlParams() {
       return {
@@ -874,6 +879,7 @@ export default {
 
       this.filterTokens = getFilterTokens(window.location.search, {
         includeStateToken: !this.withTabs,
+        hasCustomFieldsFeature: this.hasCustomFieldsFeature,
       });
       if (!this.hasStateToken && this.state === STATUS_ALL) {
         this.filterTokens = this.filterTokens.filter(

doc/administration/application_settings_cache.md

@@ -1,6 +1,6 @@
 ---
-stage: Systems
-group: Cloud Connector
+stage: None
+group: Unassigned
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 title: Application cache interval
 ---

doc/development/cells/_index.md

@@ -64,9 +64,12 @@ to think about:
 
 ## Static data
 
-Problem: A clusterwide database table is used to store static data.
-But, the primary key of the table is used as a global reference.
-This primary key is not globally consistent which creates problems.
+Problem: A database table is used to store static data.
+However, the primary key is not static because it uses an auto-incrementing sequence.
+This means the primary key is not globally consistent.
+
+References to this inconsistent primary key will create problems because the
+reference clashes across cells / organizations.
 
 Example: The `plans` table on a given Cell has the following data:
 

doc/development/pry_debugging.md

@@ -23,7 +23,7 @@ If needed, `binding.irb` can be used instead with a more limited feature set.
 
 {{< /alert >}}
 
-## `byebug` vs `binding.pry` vs `binding.irb`
+## `byebug` vs `binding.irb` vs `binding.pry`
 
 `byebug` has a very similar interface as `gdb`, but `byebug` does not
 use the powerful Pry REPL.
@@ -39,6 +39,12 @@ Check out [the docs](https://github.com/deivid-rodriguez/byebug) for the full li
 
 You can start the Pry REPL with the `pry` command.
 
+## `binding.irb`
+
+As of Ruby 2.7, IRB ships with a simple interactive debugger.
+
+Check out [the docs](https://ruby-doc.org/stdlib-2.7.0/libdoc/irb/rdoc/Binding.html) for more.
+
 ## `pry`
 
 There are **a lot** of features present in `pry`, too much to cover in
@@ -47,12 +53,6 @@ this document, so for the full documentation head over to the [Pry wiki](https:/
 Below are a few features definitely worth checking out, also run
 `help` in a pry session to see what else you can do.
 
-## `binding.irb`
-
-As of Ruby 2.7, IRB ships with a simple interactive debugger.
-
-Check out [the docs](https://ruby-doc.org/stdlib-2.7.0/libdoc/irb/rdoc/Binding.html) for more.
-
 ### State navigation
 
 With the [state navigation](https://github.com/pry/pry/wiki/State-navigation)
@@ -98,7 +98,7 @@ Similar to source browsing, is [Documentation browsing](https://github.com/pry/p
 
 With <kbd>Control</kbd> + <kbd>R</kbd> you can search your [command history](https://github.com/pry/pry/wiki/History).
 
-## Stepping
+### Stepping
 
 To step through the code, you can use the following commands:
 
@@ -110,7 +110,7 @@ To step through the code, you can use the following commands:
 - `finish`: Execute until current stack frame returns.
 - `continue`: Continue program execution and end the Pry session.
 
-## Callstack navigation
+### Callstack navigation
 
 You also can move around in the callstack with these commands:
 
@@ -123,7 +123,7 @@ You also can move around in the callstack with these commands:
 - `frame <n>`: Moves to a specific frame. Called without arguments
   displays the current frame.
 
-## Short commands
+### Short commands
 
 When you use `binding.pry` instead of `byebug`, the short commands
 like `s`, `n`, `f`, and `c` do not work. To reinstall them, add this
@@ -138,7 +138,7 @@ if defined?(PryByebug)
 end
 ```
 
-## Repeat last command
+### Repeat last command
 
 You can repeat the last command by just hitting the <kbd>Enter</kbd>
 key (for example, with `step` or`next`), if you place the following snippet

doc/user/application_security/sast/_index.md

@@ -935,7 +935,7 @@ The following are Docker image-related CI/CD variables.
 Some analyzers can be customized with CI/CD variables.
 
 | CI/CD variable                      | Analyzer             | Default                                         | Description |
-|-------------------------------------|----------------------|-------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+|-------------------------------------|----------------------|-------------------------------------------------|-------------|
 | `GITLAB_ADVANCED_SAST_ENABLED`      | GitLab Advanced SAST | `false`                                         | Set to `true` to enable [GitLab Advanced SAST](gitlab_advanced_sast.md) scanning (available in GitLab Ultimate only). |
 | `SCAN_KUBERNETES_MANIFESTS`         | Kubesec              | `"false"`                                       | Set to `"true"` to scan Kubernetes manifests. |
 | `KUBESEC_HELM_CHARTS_PATH`          | Kubesec              |                                                 | Optional path to Helm charts that `helm` uses to generate a Kubernetes manifest that `kubesec` scans. If dependencies are defined, `helm dependency build` should be ran in a `before_script` to fetch the necessary dependencies. |

spec/frontend/work_items/list/components/work_items_list_app_spec.js

@@ -48,7 +48,7 @@ import IssuableList from '~/vue_shared/issuable/list/components/issuable_list_ro
 import CreateWorkItemModal from '~/work_items/components/create_work_item_modal.vue';
 import WorkItemsListApp from '~/work_items/pages/work_items_list_app.vue';
 import { sortOptions, urlSortParams } from '~/work_items/pages/list/constants';
-import getWorkItemStateCountsQuery from '~/work_items/graphql/list/get_work_item_state_counts.query.graphql';
+import getWorkItemStateCountsQuery from 'ee_else_ce/work_items/graphql/list/get_work_item_state_counts.query.graphql';
 import getWorkItemsQuery from '~/work_items/graphql/list/get_work_items.query.graphql';
 import WorkItemDrawer from '~/work_items/components/work_item_drawer.vue';
 import {
@@ -143,6 +143,7 @@ describeSkipVue3(skipReason, () => {
         hasGroupBulkEditFeature: true,
         hasOkrsFeature: false,
         hasQualityManagementFeature: false,
+        hasCustomFieldsFeature: false,
         initialSort: CREATED_DESC,
         isGroup: true,
         isSignedIn: true,