Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/CODEOWNERS

@@ -105,18 +105,18 @@ config/bounded_contexts.yml @fabiopitino @grzesiek @stanhu @cwoolley-gitlab @tku
 /ee/spec/finders/
 /rubocop/rubocop-migrations.yml
 
-[Pipeline configuration] @gl-pipeline-maintainers
+[Pipeline configuration] @gl-dx/pipeline-maintainers
 /.gitlab-ci.yml
 /.gitlab/ci/
-/.gitlab/ci/docs.gitlab-ci.yml @gl-pipeline-maintainers @gl-docsteam
-/.gitlab/ci/frontend.gitlab-ci.yml @gl-pipeline-maintainers @gitlab-org/maintainers/frontend
-/.gitlab/ci/test-on-omnibus/ @gl-pipeline-maintainers @gl-dx/maintainers
-/.gitlab/ci/qa.gitlab-ci.yml @gl-pipeline-maintainers @gl-dx/maintainers
-/.gitlab/ci/qa-common/ @gl-pipeline-maintainers @gl-dx/maintainers
-/.gitlab/ci/releases.gitlab-ci.yml @gl-pipeline-maintainers @gitlab-org/delivery
-/.gitlab/ci/reports.gitlab-ci.yml @gl-pipeline-maintainers @gitlab-com/gl-security/appsec
-/.gitlab/ci/review-apps/qa.gitlab-ci.yml @gl-pipeline-maintainers @gl-dx/maintainers
-/.gitlab/ci/test-on-gdk/ @gl-pipeline-maintainers @gl-dx/maintainers
+/.gitlab/ci/docs.gitlab-ci.yml @gl-dx/pipeline-maintainers @gl-docsteam
+/.gitlab/ci/frontend.gitlab-ci.yml @gl-dx/pipeline-maintainers @gitlab-org/maintainers/frontend
+/.gitlab/ci/test-on-omnibus/ @gl-dx/pipeline-maintainers @gl-dx/maintainers
+/.gitlab/ci/qa.gitlab-ci.yml @gl-dx/pipeline-maintainers @gl-dx/maintainers
+/.gitlab/ci/qa-common/ @gl-dx/pipeline-maintainers @gl-dx/maintainers
+/.gitlab/ci/releases.gitlab-ci.yml @gl-dx/pipeline-maintainers @gitlab-org/delivery
+/.gitlab/ci/reports.gitlab-ci.yml @gl-dx/pipeline-maintainers @gitlab-com/gl-security/appsec
+/.gitlab/ci/review-apps/qa.gitlab-ci.yml @gl-dx/pipeline-maintainers @gl-dx/maintainers
+/.gitlab/ci/test-on-gdk/ @gl-dx/pipeline-maintainers @gl-dx/maintainers
 /gems/gem.gitlab-ci.yml
 
 [Tooling] @gl-dx/eng-prod

GITLAB_KAS_VERSION

@@ -1 +1 @@
-cc01f56459190de381f72938ed458d37e9708110
+737917b4ec3db719fbed640d2c9cbd9be6e38b05

Gemfile.checksum

@@ -1,7 +1,7 @@
 [
 {"name":"CFPropertyList","version":"3.0.7","platform":"ruby","checksum":"c45721614aca8d5eb6fa216f2ec28ec38de1a94505e9766a20e98745492c3c4c"},
 {"name":"RedCloth","version":"4.3.4","platform":"ruby","checksum":"5231b2fdd91a933915cba330e5fd1a74025e77b56f57b7404c7191ebf2812297"},
-{"name":"acme-client","version":"2.0.19","platform":"ruby","checksum":"29647ab04cde309503cf553d3f9d0a25dcca6588caca57f55f12d6c8833244f8"},
+{"name":"acme-client","version":"2.0.20","platform":"ruby","checksum":"650bb5461b67985f197757fb109bc89b024712283ab368cae5a79aabcfba3dae"},
 {"name":"actioncable","version":"7.0.8.7","platform":"ruby","checksum":"4034513841df2fd09dbbf38f37c1a00fc6c841122a8714e5d6916b8d6ce2f162"},
 {"name":"actionmailbox","version":"7.0.8.7","platform":"ruby","checksum":"940eeaa3d8e85dcd9fc6069e39571e13c5a4bdb0db52c7ab96d14da81d6ac1c2"},
 {"name":"actionmailer","version":"7.0.8.7","platform":"ruby","checksum":"8be8f9a2f8774af89822bc92e1ab6df10b3a2be59c75486a34e86a1f10d88d14"},

Gemfile.lock

@@ -229,7 +229,7 @@ GEM
       nkf
       rexml
     RedCloth (4.3.4)
-    acme-client (2.0.19)
+    acme-client (2.0.20)
       base64 (~> 0.2.0)
       faraday (>= 1.0, < 3.0.0)
       faraday-retry (>= 1.0, < 3.0.0)

Gemfile.next.checksum

@@ -1,7 +1,7 @@
 [
 {"name":"CFPropertyList","version":"3.0.7","platform":"ruby","checksum":"c45721614aca8d5eb6fa216f2ec28ec38de1a94505e9766a20e98745492c3c4c"},
 {"name":"RedCloth","version":"4.3.4","platform":"ruby","checksum":"5231b2fdd91a933915cba330e5fd1a74025e77b56f57b7404c7191ebf2812297"},
-{"name":"acme-client","version":"2.0.19","platform":"ruby","checksum":"29647ab04cde309503cf553d3f9d0a25dcca6588caca57f55f12d6c8833244f8"},
+{"name":"acme-client","version":"2.0.20","platform":"ruby","checksum":"650bb5461b67985f197757fb109bc89b024712283ab368cae5a79aabcfba3dae"},
 {"name":"actioncable","version":"7.1.5.1","platform":"ruby","checksum":"764637b5b2d97b94e412d562c177bfd16b0fd769d55c98846362f5263e8aaa0d"},
 {"name":"actionmailbox","version":"7.1.5.1","platform":"ruby","checksum":"c3c20589fe43e6fa88bba2d76a6f9805ffdd02531f4a9a4af8197d59f5a5360a"},
 {"name":"actionmailer","version":"7.1.5.1","platform":"ruby","checksum":"b213d6d880b23b093ccfef3b4f87a3d27e4666442f71b5b634b2d19e19a49759"},

Gemfile.next.lock

@@ -229,7 +229,7 @@ GEM
       nkf
       rexml
     RedCloth (4.3.4)
-    acme-client (2.0.19)
+    acme-client (2.0.20)
       base64 (~> 0.2.0)
       faraday (>= 1.0, < 3.0.0)
       faraday-retry (>= 1.0, < 3.0.0)

app/assets/javascripts/ide/init_gitlab_web_ide.js

@@ -18,11 +18,11 @@ const getMRTargetProject = () => {
   return url.searchParams.get('target_project') || '';
 };
 
-const getCrossOriginExtensionHostFlagValue = (extensionsGallerySettings) => {
+const getCrossOriginExtensionHostFlagValue = (extensionMarketplaceSettings) => {
   return (
-    extensionsGallerySettings?.enabled ||
-    extensionsGallerySettings?.reason === 'opt_in_unset' ||
-    extensionsGallerySettings?.reason === 'opt_in_disabled'
+    extensionMarketplaceSettings?.enabled ||
+    extensionMarketplaceSettings?.reason === 'opt_in_unset' ||
+    extensionMarketplaceSettings?.reason === 'opt_in_disabled'
   );
 };
 
@@ -37,7 +37,7 @@ export const initGitlabWebIDE = async (el) => {
     forkInfo: forkInfoJSON,
     editorFont: editorFontJSON,
     codeSuggestionsEnabled,
-    extensionsGallerySettings: extensionsGallerySettingsJSON,
+    extensionMarketplaceSettings: extensionMarketplaceSettingsJSON,
     settingsContextHash,
     signOutPath,
   } = el.dataset;
@@ -47,8 +47,8 @@ export const initGitlabWebIDE = async (el) => {
     ? convertObjectPropsToCamelCase(JSON.parse(editorFontJSON), { deep: true })
     : null;
   const forkInfo = forkInfoJSON ? JSON.parse(forkInfoJSON) : null;
-  const extensionsGallerySettings = extensionsGallerySettingsJSON
-    ? convertObjectPropsToCamelCase(JSON.parse(extensionsGallerySettingsJSON), { deep: true })
+  const extensionMarketplaceSettings = extensionMarketplaceSettingsJSON
+    ? convertObjectPropsToCamelCase(JSON.parse(extensionMarketplaceSettingsJSON), { deep: true })
     : undefined;
 
   const oauthConfig = getOAuthConfig(el.dataset);
@@ -82,11 +82,15 @@ export const initGitlabWebIDE = async (el) => {
         signIn: el.dataset.signInPath,
       },
       featureFlags: {
-        crossOriginExtensionHost: getCrossOriginExtensionHostFlagValue(extensionsGallerySettings),
+        crossOriginExtensionHost: getCrossOriginExtensionHostFlagValue(
+          extensionMarketplaceSettings,
+        ),
         languageServerWebIDE: isLanguageServerEnabled,
       },
       editorFont,
-      extensionsGallerySettings,
+      // TODO: Use extensionMarketplaceSettings when https://gitlab.com/gitlab-org/gitlab-web-ide/-/merge_requests/425
+      // is merged and deployed.
+      extensionsGallerySettings: extensionMarketplaceSettings,
       settingsContextHash,
       codeSuggestionsEnabled,
       handleContextUpdate: handleUpdateUrl,

app/helpers/ide_helper.rb

@@ -79,16 +79,18 @@ def new_ide_oauth_data
   end
 
   def new_ide_data(project:)
-    extensions_gallery_settings = WebIde::ExtensionsMarketplace.webide_extensions_gallery_settings(user: current_user)
+    extension_marketplace_settings = WebIde::ExtensionMarketplace.webide_extension_marketplace_settings(
+      user: current_user
+    )
     settings_context_hash = WebIde::SettingsSync.settings_context_hash(
-      extensions_gallery_settings: extensions_gallery_settings
+      extension_marketplace_settings: extension_marketplace_settings
     )
 
     {
       'project-path' => project&.path_with_namespace,
       'csp-nonce' => content_security_policy_nonce,
       'editor-font' => new_ide_fonts.to_json,
-      'extensions-gallery-settings' => extensions_gallery_settings.to_json,
+      'extension-marketplace-settings' => extension_marketplace_settings.to_json,
       'settings-context-hash' => settings_context_hash
     }.merge(new_ide_code_suggestions_data).merge(new_ide_oauth_data)
   end

app/helpers/preferences_helper.rb

@@ -174,7 +174,7 @@ def integration_views
   private
 
   def extensions_marketplace_view
-    return unless WebIde::ExtensionsMarketplace.feature_enabled?(user: current_user)
+    return unless WebIde::ExtensionMarketplace.feature_enabled?(user: current_user)
 
     build_extensions_marketplace_view(
       title: s_("Preferences|Web IDE"),
@@ -184,13 +184,13 @@ def extensions_marketplace_view
   end
 
   def build_extensions_marketplace_view(title:, message:)
-    extensions_marketplace_home = "%{linkStart}#{::WebIde::ExtensionsMarketplace.marketplace_home_url}%{linkEnd}"
+    extensions_marketplace_home = "%{linkStart}#{::WebIde::ExtensionMarketplace.marketplace_home_url}%{linkEnd}"
     {
       name: 'extensions_marketplace',
       message: format(message, extensions_marketplace_home: extensions_marketplace_home),
       title: title,
-      message_url: WebIde::ExtensionsMarketplace.marketplace_home_url,
-      help_link: WebIde::ExtensionsMarketplace.help_preferences_url
+      message_url: WebIde::ExtensionMarketplace.marketplace_home_url,
+      help_link: WebIde::ExtensionMarketplace.help_preferences_url
     }
   end
 

app/models/work_items/rollupable_dates.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module WorkItems
+  class RollupableDates
+    include ::Gitlab::Utils::StrongMemoize
+
+    def initialize(source, can_rollup:)
+      @source = source
+      @can_rollup = can_rollup
+    end
+
+    def fixed?
+      return true unless @can_rollup
+      return true if source.start_date_is_fixed && source.start_date_fixed.present?
+      return true if source.due_date_is_fixed && source.due_date_fixed.present?
+      return true if source.start_date_is_fixed && source.due_date_is_fixed
+
+      false
+    end
+    strong_memoize_attr :fixed?
+
+    def start_date
+      return source.start_date_fixed if fixed?
+
+      source.start_date
+    end
+
+    def start_date_fixed
+      source.start_date_fixed
+    end
+
+    def due_date
+      return source.due_date_fixed if fixed?
+
+      source.due_date
+    end
+
+    def due_date_fixed
+      source.due_date_fixed
+    end
+
+    private
+
+    attr_reader :source
+  end
+end
+
+WorkItems::RollupableDates.prepend_mod

app/models/work_items/widgets/start_and_due_date.rb

@@ -39,7 +39,7 @@ def sorting_keys
       # rubocop:disable Gitlab/NoCodeCoverageComment -- overridden and tested in EE
       # :nocov:
       def fixed?
-        true
+        rollupable_dates.fixed?
       end
 
       def can_rollup?
@@ -51,23 +51,24 @@ def can_rollup?
       def start_date
         return work_item&.start_date unless dates_source_present?
 
-        dates_source.start_date_fixed
+        rollupable_dates.start_date
       end
 
       def due_date
         return work_item&.due_date unless dates_source_present?
 
-        dates_source.due_date_fixed
+        rollupable_dates.due_date
       end
 
       private
 
-      def dates_source
-        return DatesSource.new if work_item.blank?
-
-        work_item.dates_source || work_item.build_dates_source
+      def rollupable_dates
+        WorkItems::RollupableDates.new(
+          work_item.dates_source || work_item.build_dates_source,
+          can_rollup: can_rollup?
+        )
       end
-      strong_memoize_attr :dates_source
+      strong_memoize_attr :rollupable_dates
 
       def dates_source_present?
         return false if work_item&.dates_source.blank?
@@ -77,6 +78,7 @@ def dates_source_present?
           .slice(:start_date, :start_date_fixed, :due_date, :due_date_fixed)
           .any? { |_, value| value.present? }
       end
+      strong_memoize_attr :dates_source_present?
     end
   end
 end

app/views/profiles/preferences/show.html.haml

@@ -10,7 +10,7 @@
 - rich_text_editor_help_text = s_('Preferences|Type in rich text, as you see it.')
 - @color_modes = Gitlab::ColorModes::available_modes.to_json
 - @themes = Gitlab::Themes::available_themes.to_json
-- extensions_marketplace_url = ::WebIde::ExtensionsMarketplace.marketplace_home_url
+- extensions_marketplace_url = ::WebIde::ExtensionMarketplace.marketplace_home_url
 - data_attributes = { color_modes: @color_modes, themes: @themes, integration_views: integration_views.to_json, user_fields: user_fields, body_classes: Gitlab::Themes.body_classes, profile_preferences_path: profile_preferences_path, extensions_marketplace_url: extensions_marketplace_url }
 - @force_desktop_expanded_sidebar = true
 

doc/administration/settings/sign_up_restrictions.md

@@ -130,16 +130,17 @@ When you turn on restricted access, the following known issues might occur and r
   - You use SAML or SCIM to add new members, and have exceeded the number of seats in the subscription.
   - Multiple users with administrator access add members simultaneously.
   - New billable users delay accepting an invitation.
-  - You change from using the user cap to restricted access, and have users pending approval
-    from before you changed to restricted access. In this case, those users remain in a pending state. If
-    pending users are approved while using restricted access, you might exceed the number of seats in your subscription.
 - If you renew your subscription through the GitLab Sales Team for fewer users than your current
   subscription, you will incur an overage fee. To avoid this fee, remove additional users before your
   renewal starts. For example, if you have 20 users and renew your subscription for 15 users,
 you will be charged overages for the five additional users.
 
 ## User cap
 
+DETAILS:
+**Tier:** Premium, Ultimate
+**Offering:** GitLab Self-Managed
+
 The user cap is the maximum number of billable users who can sign up or be added to a subscription
 without administrator approval. After the user cap is reached, users who sign up or are
 added must be [approved](../moderate_users.md#approve-or-reject-a-user-sign-up)

doc/development/documentation/_index.md

@@ -90,7 +90,7 @@ rather than using the GitLab community fork.
 The changes were added to GitLab in your forked repository, in a branch with the name noted in the last step.
 
 Now, create a merge request. This merge request is how the changes from your branch
-will be merged into the GitLab `master` branch.
+are merged into the GitLab `master` branch.
 
 1. On the left sidebar, select **Code > Merge requests**.
 1. Select **New merge request**.

doc/development/documentation/backporting.md

@@ -102,8 +102,8 @@ you must update the Docker image that holds that version's documentation.
 The Docker image determines the contents that are displayed when you select the
 version dropdown list in the upper-right corner of the documentation.
 
-Run a [new pipeline](https://gitlab.com/gitlab-org/gitlab-docs/-/pipelines/new)
-in the `gitlab-docs` repository for every version of the documentation that needs
+Run a [new pipeline](https://gitlab.com/gitlab-org/technical-writing/docs-gitlab-com/-/pipelines/new)
+in the `docs-gitlab-com` repository for every version of the documentation that needs
 an update.
 
 Choose the branch name that matches the stable version, for example `16.11` or `17.0`.
@@ -116,8 +116,8 @@ If the backport change was made to one of the last three stable branches,
 update the main docs site:
 
 1. After the pipeline finishes and the Docker image is updated, go to the
-   [pipeline schedules](https://gitlab.com/gitlab-org/gitlab-docs/-/pipeline_schedules)
-   and run the **Build Docker images manually** schedule.
+   [pipeline schedules](https://gitlab.com/gitlab-org/technical-writing/docs-gitlab-com/-/pipeline_schedules)
+   and run the **Build Docker images pipeline (Manual)** schedule.
 
 1. A dialog with a link to the **pipelines** page appears. Select that link.
 
@@ -128,7 +128,7 @@ update the main docs site:
    **test:image:docs-latest** job in the **test** stage to finish first.
 
 1. When the **image:docs-latest** job is finished,
-  [run a new pipeline](https://gitlab.com/gitlab-org/gitlab-docs/-/pipelines/new)
+  [run a new pipeline](https://gitlab.com/gitlab-org/technical-writing/docs-gitlab-com/-/pipelines/new)
   that targets the main branch.
 
 1. After the pipeline finishes, go to `https://docs.gitlab.com` and verify that

doc/development/documentation/drawers.md

@@ -45,14 +45,9 @@ To create this content:
   The `H1` heading is the drawer title.
 - Do not include any characters other than plain text in the `H1`.
 - The drawer component is narrow and not resizable.
-  - If you include tables, the content within should be brief.
+  - If you include tables, the content in the table should be brief.
   - While no technical limitation exists on the number of characters
     you can use, you should preview the drawer content to
     ensure it renders well.
 - To link from the drawer to other content, use absolute URLs.
-- Do not include:
-  - Tier badges
-  - History text
-  - Alert boxes
-  - Images
-  - SVG icons
+- Do not include Hugo shortcodes, such as Alert boxes or SVG icons.

doc/development/documentation/experiment_beta.md

@@ -22,28 +22,39 @@ When the feature changes from experiment or beta to generally available:
 ## Features that require user enrollment or feedback
 
 To include details about how users should enroll or leave feedback,
-add it below the `FLAG:` note.
+add it below the `type=flag` alert.
 
 For example:
 
 ```markdown
 ## Great new feature
 
-DETAILS:
-**Status:** Experiment
+{{</* details */>}}
 
-> - [Introduced](https://issue-link) in GitLab 15.10. This feature is an [experiment](<link_to>/policy/development_stages_support.md).
+Status: Experiment
+
+{{</* /details */>}}
+
+{{</* history */>}}
+
+- [Introduced](https://issue-link) in GitLab 15.10. This feature is an [experiment](<link_to>/policy/development_stages_support.md).
+
+{{</* /history */>}}
+
+{{</* alert type="flag" */>}}
 
-FLAG:
 The availability of this feature is controlled by a feature flag.
 For more information, see the history.
 This feature is available for testing, but not ready for production use.
 
+{{</* /alert */>}}
+
 Use this new feature when you need to do this new thing.
 
 This feature is an [experiment](<link_to>/policy/development_stages_support.md). To join
 the list of users testing this feature, do this thing. If you find a bug,
 [open an issue](https://link).
+
 ```
 
 ## GitLab Duo features