app/services/projects/group_links/update_service.rb

@@ -20,19 +20,15 @@ def execute(group_link_params)
       attr_reader :group_link
 
       def refresh_authorizations
-        if Feature.enabled?(:specialized_worker_for_project_share_update_auth_recalculation)
-          AuthorizedProjectUpdate::ProjectRecalculateWorker.perform_async(project.id)
-
-          # Until we compare the inconsistency rates of the new specialized worker and
-          # the old approach, we still run AuthorizedProjectsWorker
-          # but with some delay and lower urgency as a safety net.
-          group_link.group.refresh_members_authorized_projects(
-            blocking: false,
-            priority: UserProjectAccessChangedService::LOW_PRIORITY
-          )
-        else
-          group_link.group.refresh_members_authorized_projects
-        end
+        AuthorizedProjectUpdate::ProjectRecalculateWorker.perform_async(project.id)
+
+        # Until we compare the inconsistency rates of the new specialized worker and
+        # the old approach, we still run AuthorizedProjectsWorker
+        # but with some delay and lower urgency as a safety net.
+        group_link.group.refresh_members_authorized_projects(
+          blocking: false,
+          priority: UserProjectAccessChangedService::LOW_PRIORITY
+        )
       end
 
       def requires_authorization_refresh?(params)

app/services/projects/transfer_service.rb

@@ -156,19 +156,15 @@ def refresh_permissions
       user_ids = @old_namespace.user_ids_for_project_authorizations |
         @new_namespace.user_ids_for_project_authorizations
 
-      if Feature.enabled?(:specialized_worker_for_project_transfer_auth_recalculation)
-        AuthorizedProjectUpdate::ProjectRecalculateWorker.perform_async(project.id)
-
-        # Until we compare the inconsistency rates of the new specialized worker and
-        # the old approach, we still run AuthorizedProjectsWorker
-        # but with some delay and lower urgency as a safety net.
-        UserProjectAccessChangedService.new(user_ids).execute(
-          blocking: false,
-          priority: UserProjectAccessChangedService::LOW_PRIORITY
-        )
-      else
-        UserProjectAccessChangedService.new(user_ids).execute
-      end
+      AuthorizedProjectUpdate::ProjectRecalculateWorker.perform_async(project.id)
+
+      # Until we compare the inconsistency rates of the new specialized worker and
+      # the old approach, we still run AuthorizedProjectsWorker
+      # but with some delay and lower urgency as a safety net.
+      UserProjectAccessChangedService.new(user_ids).execute(
+        blocking: false,
+        priority: UserProjectAccessChangedService::LOW_PRIORITY
+      )
     end
 
     def rollback_side_effects

app/views/profiles/show.html.haml

@@ -80,7 +80,7 @@
       %p= s_("Profiles|Set your local time zone")
     .col-lg-8
       %h5= _("Time zone")
-      = dropdown_tag(_("Select a time zone"), options: { toggle_class: 'gl-button btn js-timezone-dropdown input-lg', title: _("Select a time zone"), filter: true, placeholder: s_("OfSearchInADropdown|Filter"), data: { data: timezone_data } } )
+      = dropdown_tag(_("Select a time zone"), options: { toggle_class: 'gl-button btn js-timezone-dropdown input-lg gl-w-full!', title: _("Select a time zone"), filter: true, placeholder: s_("OfSearchInADropdown|Filter"), data: { data: timezone_data } } )
       %input.hidden{ :type => 'hidden', :id => 'user_timezone', :name => 'user[timezone]', value: @user.timezone }
     .col-lg-12
       %hr

app/views/projects/branches/index.html.haml

 - page_title _('Branches')
 - add_to_breadcrumbs(_('Repository'), project_tree_path(@project))
 
-.top-area.adjust
-  %ul.nav-links.issues-state-filters.nav.nav-tabs
-    %li{ class: active_when(@mode == 'overview') }>
-      = link_to s_('Branches|Overview'), project_branches_path(@project), title: s_('Branches|Show overview of the branches')
-
-    %li{ class: active_when(@mode == 'active') }>
-      = link_to s_('Branches|Active'), project_branches_filtered_path(@project, state: 'active'), title: s_('Branches|Show active branches')
-
-    %li{ class: active_when(@mode == 'stale') }>
-      = link_to s_('Branches|Stale'), project_branches_filtered_path(@project, state: 'stale'), title: s_('Branches|Show stale branches')
-
-    %li{ class: active_when(!%w[overview active stale].include?(@mode)) }>
-      = link_to s_('Branches|All'), project_branches_filtered_path(@project, state: 'all'), title: s_('Branches|Show all branches')
+.top-area.gl-border-0
+  = gl_tabs_nav({ class: 'gl-flex-grow-1 gl-border-b-0' }) do
+    = gl_tab_link_to s_('Branches|Overview'), project_branches_path(@project), { item_active: @mode == 'overview', title: s_('Branches|Show overview of the branches') }
+    = gl_tab_link_to s_('Branches|Active'), project_branches_filtered_path(@project, state: 'active'), { title: s_('Branches|Show active branches') }
+    = gl_tab_link_to s_('Branches|Stale'), project_branches_filtered_path(@project, state: 'stale'), { title: s_('Branches|Show stale branches') }
+    = gl_tab_link_to s_('Branches|All'), project_branches_filtered_path(@project, state: 'all'), { item_active: !%w[overview active stale].include?(@mode), title: s_('Branches|Show all branches') }
 
   .nav-controls
     #js-branches-sort-dropdown{ data: { project_branches_filtered_path: project_branches_path(@project, state: 'all'), sort_options: branches_sort_options_hash.to_json, mode: @mode } }

app/views/users/show.html.haml

@@ -84,10 +84,12 @@
                 = sprite_icon('location', css_class: 'fgray')
                 %span{ itemprop: 'addressLocality' }
                   = @user.location
-            = render 'middle_dot_divider', stacking: true do
-              = sprite_icon('clock', css_class: 'fgray')
-              %span
-                = local_time(@user.timezone)
+            - user_local_time = local_time(@user.timezone)
+            - unless user_local_time.nil?
+              = render 'middle_dot_divider', stacking: true, data: { testid: 'user-local-time' } do
+                = sprite_icon('clock', css_class: 'fgray')
+                %span
+                  = user_local_time
             - unless work_information(@user).blank?
               = render 'middle_dot_divider', stacking: true do
                 = sprite_icon('work', css_class: 'fgray')

config/feature_flags/development/specialized_worker_for_project_share_update_auth_recalculation.yml

----
-name: specialized_worker_for_project_share_update_auth_recalculation
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61964
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/334234
-milestone: '14.1'
-type: development
-group: group::access
-default_enabled: false

config/feature_flags/development/specialized_worker_for_project_transfer_auth_recalculation.yml

----
-name: specialized_worker_for_project_transfer_auth_recalculation
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61967
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/334237
-milestone: '14.1'
-type: development
-group: group::access
-default_enabled: false

config/locales/en.yml

@@ -10,6 +10,9 @@ en:
         target: Target issue
       group:
         path: Group URL
+      member:
+        user: "The member's email address"
+        invite_email: "The member's email address"
       project/error_tracking_setting:
         token: "Auth Token"
         project: "Project"

doc/administration/timezone.md

@@ -48,8 +48,12 @@ gitlab-ctl restart
 > - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/29669) in GitLab 13.9.
 > - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/29669) in GitLab 14.1.
 
-A user can set their time zone in their profile. If a user has not set their time zone, it defaults
-to the time zone [configured at the instance level](#changing-your-time-zone). On GitLab.com, the
-default time zone is UTC.
+Users can set their time zone in their profile. On GitLab.com, the default time zone is UTC.
+
+New users do not have a default time zone in [GitLab 14.4 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/340795). New users must
+explicitly set their time zone before it displays on their profile.
+
+In GitLab 14.3 and earlier, users with no configured time zone default to the time zone
+[configured at the instance level](#changing-your-time-zone).
 
 For more information, see [Set your time zone](../user/profile/index.md#set-your-time-zone).

doc/api/integrations.md

@@ -304,12 +304,12 @@ GET /projects/:id/integrations/campfire
 
 Datadog system monitoring.
 
-### Create/Edit Datadog service
+### Create/Edit Datadog integration
 
-Set Datadog service for a project.
+Set Datadog integration for a project.
 
 ```plaintext
-PUT /projects/:id/services/datadog
+PUT /projects/:id/integrations/datadog
 ```
 
 Parameters:
@@ -322,20 +322,20 @@ Parameters:
 | `datadog_service` | string | false | Name of this GitLab instance that all data will be tagged with |
 | `datadog_env`     | string | false | The environment tag that traces will be tagged with |
 
-### Delete Datadog service
+### Delete Datadog integration
 
-Delete Datadog service for a project.
+Delete Datadog integration for a project.
 
 ```plaintext
-DELETE /projects/:id/services/datadog
+DELETE /projects/:id/integrations/datadog
 ```
 
-### Get Datadog service settings
+### Get Datadog integration settings
 
-Get Datadog service settings for a project.
+Get Datadog integration settings for a project.
 
 ```plaintext
-GET /projects/:id/services/datadog
+GET /projects/:id/integrations/datadog
 ```
 
 ## Unify Circuit
@@ -549,12 +549,12 @@ GET /projects/:id/integrations/emails-on-push
 
 Use IBM Engineering Workflow Management (EWM) as a project's issue tracker.
 
-### Create/Edit EWM service
+### Create/Edit EWM integration
 
-Set EWM service for a project.
+Set EWM integration for a project.
 
 ```plaintext
-PUT /projects/:id/services/ewm
+PUT /projects/:id/integrations/ewm
 ```
 
 Parameters:
@@ -565,20 +565,20 @@ Parameters:
 | `project_url`   | string | true | The URL to the project in EWM |
 | `issues_url`    | string | true | The URL to view an issue in EWM. Must contain `:id` |
 
-### Delete EWM service
+### Delete EWM integration
 
-Delete EWM service for a project.
+Delete EWM integration for a project.
 
 ```plaintext
-DELETE /projects/:id/services/ewm
+DELETE /projects/:id/integrations/ewm
 ```
 
-### Get EWM service settings
+### Get EWM integration settings
 
-Get EWM service settings for a project.
+Get EWM integration settings for a project.
 
 ```plaintext
-GET /projects/:id/services/ewm
+GET /projects/:id/integrations/ewm
 ```
 
 ## Confluence integration
@@ -726,8 +726,6 @@ GET /projects/:id/integrations/github
 
 ## Hangouts Chat
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/20290) in GitLab 11.2.
-
 Google Workspace team collaboration tool.
 
 ### Create/Edit Hangouts Chat integration
@@ -738,9 +736,6 @@ Set Hangouts Chat integration for a project.
 PUT /projects/:id/integrations/hangouts-chat
 ```
 
-NOTE:
-Specific event parameters (for example, `push_events` flag) were [introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/11435) in GitLab 10.4.
-
 Parameters:
 
 | Parameter | Type | Required | Description |
@@ -832,10 +827,6 @@ GET /projects/:id/integrations/jira
 
 Set Jira integration for a project.
 
-> Starting with GitLab 8.14, `api_url`, `issues_url`, `new_issue_url` and
-> `project_url` are replaced by `url`. If you are using an
-> older version, [follow this documentation](https://gitlab.com/gitlab-org/gitlab/-/blob/8-13-stable-ee/doc/api/services.md#jira).
-
 ```plaintext
 PUT /projects/:id/integrations/jira
 ```
@@ -1198,9 +1189,6 @@ Set Slack integration for a project.
 PUT /projects/:id/integrations/slack
 ```
 
-NOTE:
-Specific event parameters (for example, `push_events` flag and `push_channel`) were [introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/11435) in GitLab 10.4.
-
 Parameters:
 
 | Parameter | Type | Required | Description |
@@ -1308,9 +1296,6 @@ Set Mattermost notifications integration for a project.
 PUT /projects/:id/integrations/mattermost
 ```
 
-NOTE:
-Specific event parameters (for example, `push_events` flag and `push_channel`) were [introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/11435) in GitLab 10.4.
-
 Parameters:
 
 | Parameter | Type | Required | Description |

doc/topics/git/troubleshooting_git.md

@@ -126,7 +126,14 @@ MaxStartups 100:30:200
 `100:30:200` means up to 100 SSH sessions are allowed without restriction,
 after which 30% of connections are dropped until reaching an absolute maximum of 200.
 
-Once configured, restart the SSH daemon for the change to take effect.
+After you modify the value of `MaxStartups`, check for any errors in the configuration.
+
+```shell
+sudo sshd -t -f /etc/ssh/sshd_config
+```
+
+If the configuration check runs without errors, it should be safe to restart the
+SSH daemon for the change to take effect.
 
 ```shell
 # Debian/Ubuntu

doc/user/clusters/agent/ci_cd_tunnel.md

@@ -10,6 +10,10 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 > - The pre-configured `KUBECONFIG` was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/324275) in GitLab 14.2.
 > - The ability to authorize groups was [introduced](https://gitlab.com/groups/gitlab-org/-/epics/5784) in GitLab 14.3.
 
+WARNING:
+The CI/CD Tunnel is not supported for GitLab self-managed instances installed via Omnibus. We
+plan to [add support for Omnibus](https://gitlab.com/gitlab-org/gitlab/-/issues/324272) in the future.
+
 The CI/CD Tunnel enables users to access Kubernetes clusters from GitLab CI/CD jobs even if there is no network
 connectivity between GitLab Runner and a cluster. GitLab Runner does not have to be running in the same cluster.
 

doc/user/packages/dependency_proxy/index.md

@@ -171,8 +171,51 @@ from the GitLab server.
 Blobs are kept forever on the GitLab server, and there is no hard limit on how much data can be
 stored.
 
+### Using the API to clear the cache
+
 To reclaim disk space used by image blobs that are no longer needed, use
-the [Dependency Proxy API](../../../api/dependency_proxy.md).
+the [Dependency Proxy API](../../../api/dependency_proxy.md) to clear the entire
+cache.
+
+### Cleanup policies
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/294187) in GitLab Free 14.4.
+
+The cleanup policy is a scheduled job you can use to clear cached images that are no longer used,
+freeing up additional storage space. The policies use time-to-live (TTL) logic:
+
+- The number of days is configured.
+- All cached dependency proxy files that have not been pulled in that many days are deleted.
+
+Use the [GraphQL API](../../../api/graphql/reference/index.md#mutationupdatedependencyproxyimagettlgrouppolicy)
+to enable and configure cleanup policies:
+
+```graphql
+mutation {
+  updateDependencyProxyImageTtlGroupPolicy(input:
+    {
+      groupPath: "<your-full-group-path>",
+      enabled: true,
+      ttl: 90
+    }
+  ) {
+    dependencyProxyImageTtlPolicy {
+      enabled
+      ttl
+    }
+    errors
+  }
+}
+```
+
+See the [Getting started with GraphQL](../../../api/graphql/getting_started.md)
+guide to learn how to make GraphQL queries. Support for enabling and configuring cleanup policies in
+the UI is tracked in [this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/340777).
+
+When the policy is initially enabled, the default TTL setting is 90 days. Once enabled, stale
+dependency proxy files are queued for deletion each day. Deletion may not occur right away due to
+processing time. If the image is pulled after the cached files are marked as expired, the expired
+files are ignored and new files are downloaded and cached from the external registry.
 
 ## Docker Hub rate limits and the Dependency Proxy
 

ee/app/assets/javascripts/admin/subscriptions/show/components/subscription_breakdown.vue

@@ -93,7 +93,7 @@ export default {
       return this.licenseUploadPath && this.isLicenseFileType;
     },
     canRemoveLicense() {
-      return this.licenseRemovePath && this.isLicenseFileType;
+      return this.licenseRemovePath;
     },
     hasSubscription() {
       return Boolean(Object.keys(this.subscription).length);

ee/app/assets/javascripts/boards/components/board_add_new_column.vue

@@ -212,6 +212,8 @@ export default {
     },
 
     setSelectedItem(selectedId) {
+      this.selectedId = selectedId;
+
       const item = this.items.find(({ id }) => id === selectedId);
       if (!selectedId || !item) {
         this.selectedItem = null;
@@ -286,8 +288,8 @@ export default {
 
     <template v-if="hasItems" #items>
       <gl-form-radio-group
-        v-model="selectedId"
         class="gl-overflow-y-auto gl-px-5"
+        :checked="selectedId"
         data-testid="selectItem"
         @change="setSelectedItem"
       >

ee/app/assets/stylesheets/pages/ee_start_trial.scss

@@ -35,36 +35,3 @@
     opacity: 0.6;
   }
 }
-
-/* Trial License Install Modal */
-.modal-upload-trial-license {
-  .svg-container {
-    width: 90px;
-    height: 90px;
-  }
-
-  .trial-license-preview {
-    max-height: 300px;
-  }
-
-  /* Pure CSS License Key Preview Toggle */
-  .trial-license-preview,
-  .show-license,
-  .hide-license:target {
-    display: none;
-  }
-
-  .hide-license,
-  .hide-license:target + .show-license,
-  .hide-license:target ~ .trial-license-preview {
-    display: block;
-  }
-
-  .show-license,
-  .hide-license {
-    &:hover {
-      text-decoration: none;
-      color: $gray-900;
-    }
-  }
-}

ee/app/assets/stylesheets/pages/milestone.scss

@@ -42,11 +42,6 @@
   }
 }
 
-.burndown-docs-link {
-  color: inherit;
-  text-decoration: underline;
-}
-
 .burndown-header {
   margin: 24px 0 12px;
 

ee/app/assets/stylesheets/pages/projects.scss

-.protected-branch-push-access-list,
-.protected-branch-merge-access-list {
-  a {
-    color: $white;
-  }
-}
-
 .project-mirror-settings {
-  .ssh-public-key,
-  .btn-copy-ssh-public-key {
-    float: left;
-  }
-
-  .ssh-public-key {
-    width: 94%;
-    word-wrap: break-word;
-    word-break: break-all;
-  }
-
-  .btn-copy-ssh-public-key {
-    margin-left: 5px;
-  }
-
   .known-hosts {
     font-family: $monospace-font;
   }
@@ -38,16 +16,6 @@
   }
 }
 
-.load-wrapper {
-  position: absolute;
-  background: $black-transparent;
-  width: 100%;
-  height: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
 .project-mirror-text {
   @include media-breakpoint-up(sm) {
     float: left;

ee/app/assets/stylesheets/pages/promotions.scss

@@ -93,25 +93,6 @@
   }
 }
 
-.promotion-modal {
-  .modal-dialog {
-    width: 540px;
-  }
-
-  .modal-header {
-    border-bottom: 0;
-  }
-
-  .modal-body {
-    margin-top: -20px;
-    padding: 16px 16px 32px;
-  }
-
-  .modal-footer {
-    border-top: 0;
-  }
-}
-
 .promotion-issue-sidebar {
   .promotion-issue-sidebar-message {
     padding: $gl-padding-top;

ee/app/assets/stylesheets/pages/requirements.scss

 .requirements-container {
-  // Following overrides will be removed once
-  // we add filtered search bar on the page
-  // see https://gitlab.com/gitlab-org/gitlab/-/issues/212543
-  @include media-breakpoint-down(xs) {
-    .top-area {
-      border-bottom: 0;
-
-      .nav-links.mobile-separator {
-        margin-bottom: 0;
-      }
-    }
-  }
-
-  .requirement-form {
-    .requirement-form-textarea {
-      line-height: $gl-line-height-24;
-      // We need `!important` here as GlFormTextarea (based on `BFormTextarea`)
-      // somehow applies inline styles ¯\_(ツ)_/¯.
-      overflow-y: auto !important;
-    }
-  }
-
   .requirement-form-drawer {
     &.zen-mode {
       // We need to override `z-index` provided to GlDrawer