Manual merge of CE master into EE master

The merge train could not automatically merge CE into EE due to a
changelog file being removed in CE while it was modified in EE. To
resolve this, we removed the changelog file from EE as well.

VERSION

-12.1.0-pre
+12.2.0-pre

app/models/concerns/taskable.rb

@@ -15,7 +15,8 @@ module Taskable
   INCOMPLETE_PATTERN = /(\[[\s]\])/.freeze
   ITEM_PATTERN       = %r{
     ^
-    \s*(?:[-+*]|(?:\d+\.)) # list prefix required - task item has to be always in a list
+    (?:(?:>\s{0,4})*)         # optional blockquote characters
+    \s*(?:[-+*]|(?:\d+\.))    # list prefix required - task item has to be always in a list
     \s+                       # whitespace prefix has to be always presented for a list item
     (\[\s\]|\[[xX]\])         # checkbox
     (\s.+)                    # followed by whitespace and some text.

app/models/personal_access_token.rb

@@ -7,6 +7,7 @@ class PersonalAccessToken < ApplicationRecord
   add_authentication_token_field :token, digest: true
 
   REDIS_EXPIRY_TIME = 3.minutes
+  TOKEN_LENGTH = 20
 
   serialize :scopes, Array # rubocop:disable Cop/ActiveRecordSerialize
 

changelogs/unreleased/11039-moved-code-difference-from-EE-to-CE.yml

----
-title: "Moved EE/CE code differences for file `app/views/search/_category.html.haml` into CE"
-merge_request: 28755
-author: Michel Engelen
-type: other

changelogs/unreleased/11448-fix-cs-with-k8s-runners.yml

----
-title: Fix Container Scanning job timeout when using the kubernetes executor
-merge_request: 29706
-author: 
-type: fixed

changelogs/unreleased/11888-regression-deploy-correlation-markers-on-monitoring-graphs-not-clickable.yml

----
-title: Turn commit sha in monitor charts popover to link
-merge_request: 29914
-author:
-type: fixed

changelogs/unreleased/12533-shared-runners-warning.yml

----
-title: Removes EE differences for app/views/admin/users/show.html.haml
-merge_request:
-author:
-type: other

changelogs/unreleased/12550-fullscrean.yml

----
-title: Removes EE differences for app/views/layouts/fullscreen.html.haml
-merge_request:
-author:
-type: other

changelogs/unreleased/12553-preferences.yml

----
-title: Removes EE diff for app/views/profiles/preferences/show.html.haml
-merge_request:
-author:
-type: other

changelogs/unreleased/17690-Protect-TeamCity-builds-for-triggering-when-a-branch-is-deleted-And-add-MR-option.yml

----
-title: Protect TeamCity builds from triggering when a branch has been deleted. And a MR-option
-merge_request: 29836
-author: Nikolay Novikov, Raphael Tweitmann
-type: fixed

changelogs/unreleased/29775-fix-nested-lists-unnecessary-margin.yml

----
-title: Fix nested lists unnecessary margin
-merge_request: 29775
-author: Kuba Kopeć
-type: fixed

changelogs/unreleased/30355-use-hours-only-for-time-tracking.yml

----
-title: Add option to limit time tracking units to hours
-merge_request: 29469
-author: Jon Kolb
-type: added

changelogs/unreleased/32452-multiple-discussions.yml

----
-title: Resolve Multiple discussions per line in merge request diffs
-merge_request: 28748
-author:
-type: added

changelogs/unreleased/35757-move-issues-in-boards-pderichs.yml

----
-title: Add endpoint to move multiple issues in boards
-merge_request: 30216
-author:
-type: added

changelogs/unreleased/38105-pre-release-tag.yml

----
-title: Renders a pre-release tag for releases
-merge_request: 29797
-author:
-type: changed

changelogs/unreleased/40379-CJK-search-min-chars.yml

----
-title: Remove minimum character limits for fuzzy searches when using a CTE
-merge_request: 29810
-author:
-type: fixed

changelogs/unreleased/42399-registry-confirm-deletion.yml

----
-title: Add confirmation for registry image deletion
-merge_request: 29505
-author:
-type: added

changelogs/unreleased/44106-include-subgroups-in-group-activity.yml

----
-title: Include events from subgroups in group's activity
-merge_request: 29953
-author: Fabian Schneider @fabsrc
-type: changed

changelogs/unreleased/44949-do-not-update-updated_at-on-an-issue-when-reordering-it.yml

----
-title: Will not update issue timestamps when changing positions in a list
-merge_request: 29677
-author:
-type: changed

changelogs/unreleased/45104-special-characters-in-project-name-path-prevent-users-from-using-the-container-registry.yml

----
-title: Updated container registry to display error message when special characters in path. Documentation has also been updated.
-merge_request: 29616
-author:
-type: changed

changelogs/unreleased/45120-fix-ide-editor-to-update-size-on-show-change.yml

----
-title: Fix IDE editor not showing when switching back from preview
-merge_request: 30135
-author:
-type: fixed

changelogs/unreleased/48771-label-picker-line-break-on-long-label-titles.yml

----
-title: 'Resolve Label picker: Line break on long label titles'
-merge_request: 30610
-author: 
-type: fixed

changelogs/unreleased/49814-display-in-admin-area-if-emails-are-verified-or-not.yml

----
-title: Add a verified pill next to email addresses under the admin users section.
-merge_request: 29669
-author:
-type: added

changelogs/unreleased/50228-deploy-tokens-custom-username.yml

----
-title: Allow custom username for deploy tokens
-merge_request: 29639
-author:
-type: added

changelogs/unreleased/50834-change-http-status-code-when-repository-disabled.yml

----
-title: "Changed HTTP Status Code for disabled repository on /branches and /commits to 404"
-merge_request: 29585
-author: Sam Battalio
-type: changed

changelogs/unreleased/51794-add-ordering-to-runner-jobs-api.yml

----
-title: Add order_by and sort params to list runner jobs api
-merge_request: 29629
-author: Sujay Patel
-type: added

changelogs/unreleased/51952-forking-via-webide.yml

----
-title: Resolve "500 error when forking via the web IDE button"
-merge_request: 29909
-author:
-type: fixed

changelogs/unreleased/51952-redirect-to-webide-in-fork.yml

----
-title: Open WebIDE in fork when user doesn't have access
-merge_request: 30642
-author:
-type: changed

changelogs/unreleased/52366-improved-group-lists-ui.yml

----
-title: Improve group list UI
-merge_request: 26542
-author:
-type: changed

changelogs/unreleased/52442-minimal-remove-mysql-support.yml

----
-title: Remove MySQL support
-merge_request: 29790
-author:
-type: removed

changelogs/unreleased/52954-allow-developers-to-delete-tags.yml

----
-title: Allow developers to delete tags
-merge_request: 29668
-author:
-type: changed

changelogs/unreleased/53357-fix-plus-in-upload-file-names.yml

----
-title: Fix broken URLs for uploads with a plus in the filename
-merge_request: 29915
-author:
-type: fixed

changelogs/unreleased/53811-issue-boards-to-core-projects-backend-ce.yml

----
-title: Move Multiple Issue Boards for Projects to Core
-merge_request:
-author:
-type: added

changelogs/unreleased/54117-transactional-rebase.yml

----
-title: Allow asynchronous rebase operations to be monitored
-merge_request: 29940
-author:
-type: fixed

changelogs/unreleased/54595-incorrect-reaction-emoji-placement-in-discussion.yml

----
-title: Fix incorrect emoji placement in commit diff discussion
-merge_request: 29445
-author:
-type: fixed

changelogs/unreleased/55487-enable-group-terminals-button.yml

----
-title: Enable terminals button for group clusters
-merge_request: 30255
-author:
-type: added

changelogs/unreleased/55623-group-cluster-apis.yml

----
-title: Add API for CRUD group clusters
-merge_request: 30213
-author:
-type: added

changelogs/unreleased/55902-disable-creation-of-non-rbac-kubernetes-clusters.yml

----
-title: Remove support for creating non-RBAC kubernetes clusters
-merge_request: 29614
-author:
-type: removed

changelogs/unreleased/55953-renamed-discussion-to-thread.yml

----
-title: "renamed discussion to thread in merge-request and issue timeline"
-merge_request: 29553
-author: Michel Engelen
-type: changed

changelogs/unreleased/57538-normalize-users-private-profile-field.yml

----
-title: Migrate NULL values for users.private_profile column and update users API to reject null value for private_profile.
-merge_request: 29888
-author:
-type: changed

changelogs/unreleased/57793-fix-line-age.yml

----
-title: Support note position tracing on an image
-merge_request: 30158
-author:
-type: fixed

changelogs/unreleased/57815.yml

----
-title: Enforced requirements for UltraAuth users
-merge_request: 28941
-author: Kartikey Tanna
-type: changed

changelogs/unreleased/57918-encrypt-feature-flags-tokens-changelog.yml

----
-title: Add token_encrypted column to operations_feature_flags_clients table
-merge_request:
-author:
-type: other

changelogs/unreleased/57973-errors-in-application-settings-panel-shows-wrong-panel.yml

----
-title: Show poper panel when validation error occurs in admin settings panels
-merge_request: 25434
-author:
-type: fixed

changelogs/unreleased/58065-uniform-html-txt-email.yml

----
-title: Always shows author of created issue/started discussion/comment in HTML body and text of email
-merge_request: 29886
-author: Frank van Rest
-type: fixed

changelogs/unreleased/58689-regroup-jump-button-in-discussion.yml

----
-title: Improve discussion reply buttons layout and how jump to next discussion button
-  appears
-merge_request: 29779
-author:
-type: changed

changelogs/unreleased/58802-rename-webide.yml

----
-title: Re-name files in Web IDE in a more natural way
-merge_request: 29948
-author:
-type: changed

changelogs/unreleased/58808-fix-image-diff-on-text.yml

----
-title: Don't show image diff note on text file
-merge_request: 30221
-author:
-type: fixed

changelogs/unreleased/59028-fix-extra-plus-in-diffs.yml

----
-title: Remove duplicate trailing +/- char in merge request discussions
-merge_request: 29518
-author:
-type: fixed

changelogs/unreleased/59257-find-new-branches-harder.yml

----
-title: Look for new branches more carefully
-merge_request: 29761
-author:
-type: fixed

changelogs/unreleased/60617-enable-project-cluster-jit.yml

----
-title: Enable just-in-time Kubernetes resource creation for project-level clusters
-merge_request: 29515
-author:
-type: changed

changelogs/unreleased/60666-kubernetes-applications-uninstall-runner.yml

----
-title: Allow GitLab Runner to be uninstalled from the UI
-merge_request: 30176
-author:
-type: added

changelogs/unreleased/60856-deleting-binary-file.yml

----
-title: Removing an image should not output binary data
-merge_request: 30314
-author:
-type: fixed

changelogs/unreleased/60859-upload-after-delete.yml

----
-title: In WebIDE allow adding new entries of the same name as deleted entry
-merge_request: 30239
-author:
-type: fixed

changelogs/unreleased/60860-keep-empty-folders-in-tree.yml

----
-title: Keep the empty folders in the tree
-merge_request: 29196
-author:
-type: fixed

changelogs/unreleased/60879-fix-reports-timing-out.yml

----
-title: Fix reports jobs timing out because of cache
-merge_request: 29780
-author:
-type: fixed

changelogs/unreleased/61005-grafanaInAdminSettingsMonitoringMenu.yml

----
-title: Adds link to Grafana in Admin > Monitoring settings when grafana is enabled in config
-merge_request: 28937
-author: Romain Maneschi
-type: added

changelogs/unreleased/61156-instance-level-cluster-pod-terminal-access.yml

----
-title: Enable terminals for instance and group clusters
-merge_request: 28613
-author:
-type: added

changelogs/unreleased/61201-pass-identities-to-external-authorization.yml

----
-title: Add identity information to external authorization requests
-merge_request: 29461
-author:
-type: changed

changelogs/unreleased/61284-frontend-follow-up-from-add-packages_size-to-projectstatistics.yml

----
-title: Improved readability of storage statistics in group / project admin area
-merge_request: 30406
-author:
-type: other

changelogs/unreleased/61342-commit-search-result-doesn-t-pass-wcag-color-audit.yml

----
-title: Change color for namespace in commit search
-merge_request: 30312
-author:
-type: other

changelogs/unreleased/61613-spacing-mr-widgets.yml

----
-title: Left align mr widget icons and text
-merge_request: 28561
-author: 
-type: fixed

changelogs/unreleased/62088-search-back.yml

----
-title: Fixed back navigation for projects filter
-merge_request: 30373
-author:
-type: fixed

changelogs/unreleased/62124-new-threaded-discussion-design.yml

----
-title: Implement borderless discussion design with new reply field
-merge_request: 28580
-author:
-type: added

changelogs/unreleased/62183-update-response-code-for-bulk-delete-api-for-container-registry.yml

----
-title: Return 400 when deleting tags more often than once per hour.
-merge_request: 29448
-author:
-type: changed

changelogs/unreleased/62772-disable-kubernetes-credential-passthrough.yml

----
-title: Disable Kubernetes credential passthrough for managed project-level clusters
-merge_request: 29262
-author:
-type: removed

changelogs/unreleased/62772-migrate-managed-clusters-to-unmanaged.yml

----
-title: Migrate GitLab managed project-level clusters to unmanaged if a Kubernetes
-  namespace was unable to be created
-merge_request: 29251
-author:
-type: other

changelogs/unreleased/62826-graphql-emoji-mutations.yml

----
-title: GraphQL mutations for add, remove and toggle emoji
-merge_request: 29919
-author:
-type: added

changelogs/unreleased/62826-graphql-note-mutations.yml

----
-title: GraphQL mutations for managing Notes
-merge_request: 30210
-author:
-type: added

changelogs/unreleased/62938-wcag-aa-edited-text-color.yml

----
-title: Use darker gray color for system note metadata and edited text
-merge_request: 30054
-author:
-type: other

changelogs/unreleased/62968-environment-details-header-border-misaligned.yml

----
-title: Resolve Environment details header border misaligned
-merge_request: 30011
-author:
-type: fixed

changelogs/unreleased/62980-username-availability-checker-breaks-inline-validation.yml

----
-title: Fix the signup form's username validation messages not displaying
-merge_request: 29678
-author: Jiaan Louw
-type: fixed

changelogs/unreleased/63079-migrate-clusters-with-no-token-to-unmanaged.yml

----
-title: Migrate GitLab managed project-level clusters to unmanaged if they are missing
-  a Kubernetes service account token
-merge_request: 29648
-author:
-type: other

changelogs/unreleased/63200-reply-button-broken.yml

----
-title: Fix unresponsive reply button in discussions
-merge_request: 29936
-author:
-type: fixed

changelogs/unreleased/63227-fix-double-border.yml

----
-title: Fix Double Border in Profile Page
-merge_request: 29784
-author: Yoginth <@yo>
-type: fixed

changelogs/unreleased/63247-add-conf-toast-and-link.yml

----
-title: Include a link back to the MR for Visual Review feedback form
-merge_request: 29719
-author:
-type: changed

changelogs/unreleased/63261-the-graphql-query-for-the-mr-popover-failes-on-the-frontend.yml

----
-title: Make sure we are receiving the proper information on the MR Popover by updating
-  the IID in the graphql query
-merge_request:
-author:
-type: fixed

changelogs/unreleased/63298-prevent-excessive-sanitization-asciidoc.yml

----
-title: "Prevent excessive sanitization of AsciiDoc ouptut"
-merge_request: 30290
-author: Guillaume Grossetie
-type: added
\ No newline at end of file

changelogs/unreleased/63438-oauth2-support-with-gitlab-personal-access-token.yml

+---
+title: Personal access tokens are accepted using OAuth2 header format
+merge_request: 30277
+author:
+type: added

changelogs/unreleased/63475-fix-n-1.yml

----
-title: Improve performance of MergeRequestsController#ci_environment_status endpoint
-merge_request: 30224
-author:
-type: performance

changelogs/unreleased/63479-jira-capitalization.yml

----
-title: Replace 'JIRA' with 'Jira'
-merge_request: 29849
-author: Takuya Noguchi
-type: other

changelogs/unreleased/63507-fix-race-condition-fetching-token.yml

----
-title: Retry fetching Kubernetes Secret#token (#63507)
-merge_request: 29922
-author:
-type: fixed

changelogs/unreleased/63559-remove-avatar-from-sign-in.yml

----
-title: Resolve Avatar in Please sign in pattern too large
-merge_request: 29944
-author:
-type: fixed

changelogs/unreleased/63590-pipeline-actions-cause-full-refresh.yml

----
-title: Fix pipelines table to update without refreshing after action
-merge_request: 30190
-author:
-type: fixed

changelogs/unreleased/63656-runner-tags-search-dropdown-is-empty.yml

----
-title: Fix runner tags search dropdown being empty when there are tags
-merge_request: 29985
-author:
-type: fixed

changelogs/unreleased/63667-hashed-storage-migration-count-correctly.yml

----
-title: Display the correct amount of projects being migrated/rolled-back to Hashed Storage when specifying ranges
-merge_request: 29996
-author:
-type: fixed

changelogs/unreleased/63691-fix-doc-link.yml

----
-title: Correct link to docs for External Dashboard
-merge_request: 30019
-author:
-type: fixed

changelogs/unreleased/63873-process-start-time.yml

----
-title: Change ruby_process_start_time_seconds metric to unix timestamp instead of
-  seconds from boot.
-merge_request: 30195
-author: 
-type: fixed

changelogs/unreleased/63945-update-mixin-deep-to-1-3-2.yml

----
-title: Update mixin-deep to 1.3.2
-merge_request: 30223
-author: Takuya Noguchi
-type: other

changelogs/unreleased/63971-remove-istanbul.yml

----
-title: Remove istanbul JavaScript package
-merge_request: 30232
-author: Takuya Noguchi
-type: other

changelogs/unreleased/64066-fix-uneven-click-areas.yml

----
-title: Fix spacing issues for toasts
-merge_request: 30345
-author:
-type: fixed

changelogs/unreleased/64070-asciidoctor-enable-section-anchors.yml

----
-title: "Enable section anchors in Asciidoctor"
-merge_request: 30666
-author: Guillaume Grossetie
-type: added
\ No newline at end of file

changelogs/unreleased/64091-fix-broken-terminal.yml

----
-title: Fix environments broken terminal
-merge_request: 30401
-author:
-type: fixed

changelogs/unreleased/64161-gitlab-fqdn.yml

----
-title: Add CI variable to provide GitLab HOST
-merge_request: 30417
-author:
-type: added

changelogs/unreleased/64176-fix-error-handling.yml

----
-title: Fix invalid SSL certificate errors on Drone CI service
-merge_request: 30422
-author:
-type: fixed

changelogs/unreleased/64249-align-container-registry-empty-state-with-design-guidelines.yml

----
-title: Alignign empty container registry message with design guidelines
-merge_request: 30502
-author:
-type: other

changelogs/unreleased/64314-ci-icon.yml

----
-title: Aligns CI icon in Merge Request dashboard
-merge_request: 30558
-author:
-type: fixed

changelogs/unreleased/64315-mget_sessions_in_chunks.yml

----
-title: Do Redis lookup in batches in ActiveSession.sessions_from_ids
-merge_request: 30561
-author:
-type: performance

changelogs/unreleased/64321-wrong-url-when-creating-milestones-from-instance-milestones-dashboard.yml

----
-title: Fix wrong URL when creating milestones from instance milestones dashboard
-merge_request: 30512
-author:
-type: fixed