summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md310
-rw-r--r--VERSION2
-rw-r--r--app/assets/javascripts/environments/components/container.vue1
-rw-r--r--app/assets/javascripts/environments/components/environments_app.vue6
-rw-r--r--app/assets/javascripts/environments/components/environments_table.vue7
-rw-r--r--app/assets/javascripts/environments/index.js2
-rw-r--r--app/assets/javascripts/environments/mixins/container_mixin.js5
-rw-r--r--app/assets/javascripts/gfm_auto_complete.js4
-rw-r--r--app/assets/javascripts/groups_select.js4
-rw-r--r--app/assets/javascripts/ide/stores/modules/commit/actions.js8
-rw-r--r--app/assets/javascripts/jobs/components/environments_block.vue4
-rw-r--r--app/assets/javascripts/notes.js4
-rw-r--r--app/assets/javascripts/pages/profiles/two_factor_auths/index.js4
-rw-r--r--app/assets/javascripts/registry/components/app.vue4
-rw-r--r--app/assets/javascripts/registry/components/collapsible_container.vue31
-rw-r--r--app/assets/javascripts/registry/components/table_registry.vue58
-rw-r--r--app/assets/javascripts/registry/stores/actions.js6
-rw-r--r--app/assets/javascripts/vue_shared/components/modal_copy_button.vue6
-rw-r--r--app/assets/javascripts/vue_shared/components/pagination/constants.js4
-rw-r--r--app/controllers/projects/merge_requests_controller.rb2
-rw-r--r--app/helpers/appearances_helper.rb5
-rw-r--r--app/models/clusters/platforms/kubernetes.rb9
-rw-r--r--app/models/deployment.rb2
-rw-r--r--app/models/environment.rb4
-rw-r--r--app/models/project.rb2
-rw-r--r--app/services/clusters/gcp/finalize_creation_service.rb3
-rw-r--r--app/views/admin/users/show.html.haml5
-rw-r--r--app/views/notify/_note_email.html.haml30
-rw-r--r--app/views/notify/_note_email.text.erb26
-rw-r--r--app/views/notify/new_issue_email.html.haml5
-rw-r--r--app/views/notify/new_issue_email.text.erb12
-rw-r--r--app/views/notify/new_merge_request_email.html.haml18
-rw-r--r--app/views/notify/new_merge_request_email.text.erb6
-rw-r--r--app/views/projects/environments/index.html.haml1
-rw-r--r--app/workers/cluster_provision_worker.rb2
-rw-r--r--changelogs/unreleased/10088-move-code-differences-EE-to-CE.yml5
-rw-r--r--changelogs/unreleased/10795-add-epic-tree-BE-CE-epic-graphql-support.yml5
-rw-r--r--changelogs/unreleased/10798-remove-dind-req-for-dast.yml5
-rw-r--r--changelogs/unreleased/10842-add-missing-environments-variable-to-the-sast-analyzer-docker-container.yml5
-rw-r--r--changelogs/unreleased/11105-fix-cs-with-proxy.yml5
-rw-r--r--changelogs/unreleased/11204-turn-off-mask-by-default.yml5
-rw-r--r--changelogs/unreleased/11609-geo-remove-support-for-using-geo-with-an-installation-from-source-docs.yml5
-rw-r--r--changelogs/unreleased/12106-sp-ce.yml5
-rw-r--r--changelogs/unreleased/1340-request-job-with-age.yml5
-rw-r--r--changelogs/unreleased/13453_minimal_atom_fix.yml5
-rw-r--r--changelogs/unreleased/19569-include-information-if-issue-was-closed-via-mr.yml5
-rw-r--r--changelogs/unreleased/237-style-toast-component.yml5
-rw-r--r--changelogs/unreleased/27987-use-findorcreateservice-to-create-labels.yml5
-rw-r--r--changelogs/unreleased/28757-remove-docker-pull-prefix-when-copying-a-tag-from-the-registry.yml5
-rw-r--r--changelogs/unreleased/28996-create-mvc-ui-in-haml.yml5
-rw-r--r--changelogs/unreleased/30138-display-cycle-analytics-issue-logic-fixes.yml5
-rw-r--r--changelogs/unreleased/30138-display-cycle-analytics-issue.yml5
-rw-r--r--changelogs/unreleased/33064-add-labels-to-note-event-payload.yml5
-rw-r--r--changelogs/unreleased/35428-docker-registry-date-not-accurate.yml6
-rw-r--r--changelogs/unreleased/37495.yml5
-rw-r--r--changelogs/unreleased/38561-border-radii.yml5
-rw-r--r--changelogs/unreleased/39304-broadcast-message-buttons.yml5
-rw-r--r--changelogs/unreleased/42399-registry-confirm-deletion.yml5
-rw-r--r--changelogs/unreleased/45687-web-ide-empty-state.yml5
-rw-r--r--changelogs/unreleased/47846-position-is-off-when-visiting-files-with-anchors.yml5
-rw-r--r--changelogs/unreleased/49041-issue-board-input-height.yml5
-rw-r--r--changelogs/unreleased/49517-fix-notes-import-export.yml5
-rw-r--r--changelogs/unreleased/49814-display-in-admin-area-if-emails-are-verified-or-not.yml5
-rw-r--r--changelogs/unreleased/49915-fix-error-500-admin-projects-nil-storage.yml5
-rw-r--r--changelogs/unreleased/50106-hide-whitespace-changes.yml5
-rw-r--r--changelogs/unreleased/50850-kerrizor-extend-api-to-accept-start_project-option.yml5
-rw-r--r--changelogs/unreleased/51022-added-extended-height-to-labels-dropdown.yml5
-rw-r--r--changelogs/unreleased/51636-task-list-api-pderichs.yml5
-rw-r--r--changelogs/unreleased/51854-api-to-get-all-project-group-members-returns-duplicates.yml5
-rw-r--r--changelogs/unreleased/53134-multiple-extendes-for-a-job.yml5
-rw-r--r--changelogs/unreleased/54140-non-ar-cache-commit-markdown.yml5
-rw-r--r--changelogs/unreleased/54169-flash-warning-rebrush.yml5
-rw-r--r--changelogs/unreleased/55033-discussion-system-note-alignment.yml5
-rw-r--r--changelogs/unreleased/55125-mr-tab-scrolling.yml5
-rw-r--r--changelogs/unreleased/55253-activity-feed-ui-enhance-line-height.yml5
-rw-r--r--changelogs/unreleased/55362-refresh-blank-service-account-token.yml5
-rw-r--r--changelogs/unreleased/55447-validate-k8s-credentials.yml5
-rw-r--r--changelogs/unreleased/5615-non-admins-only-archieve-ce.yml5
-rw-r--r--changelogs/unreleased/56737-commits-and-mr-events-on-jira-api.yml5
-rw-r--r--changelogs/unreleased/56959-drop-project_auto_devops_domain.yml5
-rw-r--r--changelogs/unreleased/56959-remove-auto-devops-domain-ci-variable.yml5
-rw-r--r--changelogs/unreleased/57037-fix-mr-checkboxes-mobile-alignment.yml5
-rw-r--r--changelogs/unreleased/57189-css-label-in-forms-with-bootstrap4.yml5
-rw-r--r--changelogs/unreleased/57813-merge-request-tabs-do-not-handle-ctrl-click-correctly.yml5
-rw-r--r--changelogs/unreleased/57825-moving-an-issue-results-in-broken-image-links-in-comments.yml5
-rw-r--r--changelogs/unreleased/58065-uniform-html-txt-email.yml5
-rw-r--r--changelogs/unreleased/58269-separate-update-patch.yml5
-rw-r--r--changelogs/unreleased/58297-remove-extraneous-gitaly-calls-from-md-rendering.yml5
-rw-r--r--changelogs/unreleased/58404-set-default-max-depth-for-GraphQL.yml5
-rw-r--r--changelogs/unreleased/58433-email-notifications-do-not-work-properly-issue-due-date.yml5
-rw-r--r--changelogs/unreleased/58538-discussion-top-radius.yml5
-rw-r--r--changelogs/unreleased/58632-fix-mr-widget-padding.yml5
-rw-r--r--changelogs/unreleased/58941-use-gitlab-serverless-with-existing-knative-installation.yml5
-rw-r--r--changelogs/unreleased/58984-doc-missing-milestones-and-labels-links.yml5
-rw-r--r--changelogs/unreleased/59023-fix-web-ide-creating-branches-off-new-commits.yml5
-rw-r--r--changelogs/unreleased/59026-replace-favicon.yml5
-rw-r--r--changelogs/unreleased/59105-padding-unclickable-pipeline-job.yml5
-rw-r--r--changelogs/unreleased/59376-Report-abuse-to-GitLab-should-be-Report-abuse-in-non-gitlab-com-instances.yml5
-rw-r--r--changelogs/unreleased/59587-add-graphql-logging.yml5
-rw-r--r--changelogs/unreleased/59651-remove-unnecessary-decimal-places-on-chart-axes.yml5
-rw-r--r--changelogs/unreleased/59987-move-sign-in-2fa-on-users-sign_in-above-intro-content-on-mobile.yml5
-rw-r--r--changelogs/unreleased/60034-default-web-ide-s-merge-request-checkbox-to-true.yml5
-rw-r--r--changelogs/unreleased/60180-jira-service-fix-nil-on-find-call.yml5
-rw-r--r--changelogs/unreleased/60250-remove-mr_push_options-flag.yml5
-rw-r--r--changelogs/unreleased/60303-replace-sidekiq-mtail-metrics.yml5
-rw-r--r--changelogs/unreleased/60323-inline-validation-for-users-name-and-username-length.yml5
-rw-r--r--changelogs/unreleased/60379-remove-ci-preparing-state-feature-flag.yml5
-rw-r--r--changelogs/unreleased/60425-fix-500-when-accessing-charts-with-anonymous-user.yml5
-rw-r--r--changelogs/unreleased/60617-allow-switching-from-gitlab-managed-to-unmanaged-clusters.yml5
-rw-r--r--changelogs/unreleased/60617-enable-project-cluster-jit.yml5
-rw-r--r--changelogs/unreleased/60750-milestone-header.yml5
-rw-r--r--changelogs/unreleased/60818_yamllint_project_root.yml5
-rw-r--r--changelogs/unreleased/60819_yamllint_gitlabci.yml5
-rw-r--r--changelogs/unreleased/609120-ref-link.yml5
-rw-r--r--changelogs/unreleased/60987-emoji-picker-popup.yml5
-rw-r--r--changelogs/unreleased/61024-update-resolved-icon.yml5
-rw-r--r--changelogs/unreleased/6104-ee-ce-difference.yml5
-rw-r--r--changelogs/unreleased/61045-charts-with-many-overlapping-series-display-incorrectly.yml5
-rw-r--r--changelogs/unreleased/61049-links-activity-stream.yml5
-rw-r--r--changelogs/unreleased/61072-link-to-user-profile-not-distinguishable-on-latest-commit-widget.yml5
-rw-r--r--changelogs/unreleased/61144-style-secondary-button-type-to-be-aligned-with-pattern-library.yml5
-rw-r--r--changelogs/unreleased/61157-reviewer-roulette-shouldn-t-include-the-author-as-a-possibility.yml5
-rw-r--r--changelogs/unreleased/61313-fix-dropdown-searchbar.yml5
-rw-r--r--changelogs/unreleased/61323-snippet-copy-icon-button-is-misaligned.yml5
-rw-r--r--changelogs/unreleased/61324-non-project-snippet-new-snippet-button-should-be-green-outline.yml5
-rw-r--r--changelogs/unreleased/61339-Add-underline-to-attach-a-file.yml5
-rw-r--r--changelogs/unreleased/61393-emoji-button.yml5
-rw-r--r--changelogs/unreleased/61441.yml5
-rw-r--r--changelogs/unreleased/61511-add-expand-collapse-to-project-operation-settings.yml5
-rw-r--r--changelogs/unreleased/61565-merge-request-discussion-text-jumps-when-resolved.yml5
-rw-r--r--changelogs/unreleased/61606-support-string-piwik-website-ids.yml5
-rw-r--r--changelogs/unreleased/61629-dependency-installation-error-on-fsevents-1-2-4-with-node-js-12.yml5
-rw-r--r--changelogs/unreleased/61639-flaky-spec-issue-boards-labels-creates-project-label-spec-features-boards-sidebar_spec-rb-350.yml5
-rw-r--r--changelogs/unreleased/61697-add-project-id-to-le-common-name.yml5
-rw-r--r--changelogs/unreleased/61788-predefined-colours-dont-have-descriptive-labels.yml5
-rw-r--r--changelogs/unreleased/61795-fix-error-when-moving-issues.yml5
-rw-r--r--changelogs/unreleased/61821-tooltip-consistency.yml5
-rw-r--r--changelogs/unreleased/61827-prevent-user-popover-icon-shrink.yml5
-rw-r--r--changelogs/unreleased/61880-download-btn-group.yml5
-rw-r--r--changelogs/unreleased/61914-fix-emojis-urls.yml5
-rw-r--r--changelogs/unreleased/61928-remove-throttle-from-dirty-submit.yml6
-rw-r--r--changelogs/unreleased/61960-translatable-strings-in-issue-closure-emails.yml5
-rw-r--r--changelogs/unreleased/61988-collapse-icon-on-merge-request-diff-larger-than-profile-picture.yml5
-rw-r--r--changelogs/unreleased/61990-spinner.yml5
-rw-r--r--changelogs/unreleased/62061-note-icon-color.yml5
-rw-r--r--changelogs/unreleased/62091-remove-time-windows-flag.yml5
-rw-r--r--changelogs/unreleased/62092-missing-padding-next-to-time-windows-dropdown-on-metrics-dashboard.yml5
-rw-r--r--changelogs/unreleased/62107-fix-detail-page-header-height.yml5
-rw-r--r--changelogs/unreleased/62116-performance-issue-502-errors-on-rendering-of-issues-with-heavy-markdown-contents.yml6
-rw-r--r--changelogs/unreleased/62124-new-threaded-discussion-design.yml5
-rw-r--r--changelogs/unreleased/62134-fix-non-wraping-project-description.yml5
-rw-r--r--changelogs/unreleased/62144-fix-option-dropdown-button-size.yml5
-rw-r--r--changelogs/unreleased/62154-fe-create-fix-long-branch-name-in-dropdown.yml6
-rw-r--r--changelogs/unreleased/62227-webkit-icon-overlap.yml5
-rw-r--r--changelogs/unreleased/62253-add-kubernetes-logs-to-monitoring-ui.yml5
-rw-r--r--changelogs/unreleased/62300-target-area-for-dropdown-list-items-is-too-small-on-metrics-dashboard.yml5
-rw-r--r--changelogs/unreleased/62408-dropdown-truncate.yml5
-rw-r--r--changelogs/unreleased/62418-project-default-git-depth.yml5
-rw-r--r--changelogs/unreleased/62432-fix-participants-wrapping.yml5
-rw-r--r--changelogs/unreleased/62485-label-weights.yml5
-rw-r--r--changelogs/unreleased/62487-external-policy-desc.yml5
-rw-r--r--changelogs/unreleased/62656-adjusted-dropdown-styles.yml5
-rw-r--r--changelogs/unreleased/62684-add-index-public-email-on-users.yml5
-rw-r--r--changelogs/unreleased/62685-add-index-invite-email-to-members.yml5
-rw-r--r--changelogs/unreleased/62788-clean-up-pagination.yml5
-rw-r--r--changelogs/unreleased/62788-graphql-pagination.yml5
-rw-r--r--changelogs/unreleased/62847-url-for-the-next-request-with-pagination-is-missing-port.yml5
-rw-r--r--changelogs/unreleased/62910-task-completion-status-gql-pderichs.yml5
-rw-r--r--changelogs/unreleased/62966-embed-zoom-call-in-issue-mvc.yml5
-rw-r--r--changelogs/unreleased/62974-follow-up-from-wip-align-merge-request-icons-and-text.yml5
-rw-r--r--changelogs/unreleased/63079-exclude-k8s-namespaces-with-no-service-account-token.yml6
-rw-r--r--changelogs/unreleased/63417-add-missing-class.yml5
-rw-r--r--changelogs/unreleased/63513-ensure-gitlab-jsoncache-includes-the-gitlab-version-in-the-cache-key.yml5
-rw-r--r--changelogs/unreleased/8723-geo-remove-gitlab-lfstoken-legacyredisdevisetoken-implementation-and-usage-geo.yml5
-rw-r--r--changelogs/unreleased/9121-sort-relative-position.yml5
-rw-r--r--changelogs/unreleased/9186-implement-atmtwps-state-to-mr-widget.yml5
-rw-r--r--changelogs/unreleased/9578-adjust-milestone-completion-rate.yml5
-rw-r--r--changelogs/unreleased/9978-moved-code-differences-from-EE-to-CE.yml5
-rw-r--r--changelogs/unreleased/abstract-auto-merge.yml5
-rw-r--r--changelogs/unreleased/ac-63020-typeerror-nil-can-t-be-coerced-into-integer.yml5
-rw-r--r--changelogs/unreleased/ac-graphql-stats.yml5
-rw-r--r--changelogs/unreleased/ac-graphql-wikisize.yml5
-rw-r--r--changelogs/unreleased/ac-namespaces-stats-no-coalesce.yml5
-rw-r--r--changelogs/unreleased/add-allow_failure-to-job-api.yml5
-rw-r--r--changelogs/unreleased/add-branch-to-project-search-api.yml5
-rw-r--r--changelogs/unreleased/add-constraint-for-milestone-dates.yml5
-rw-r--r--changelogs/unreleased/add-lfs-blob-ids-to-tree-type.yml5
-rw-r--r--changelogs/unreleased/add-warning-to-backup-rake-task.yml5
-rw-r--r--changelogs/unreleased/add-wiki-size-to-statistics.yml5
-rw-r--r--changelogs/unreleased/allow-emoji-in-references.yml5
-rw-r--r--changelogs/unreleased/always-show-pipelines-must-succeed-checkbox.yml5
-rw-r--r--changelogs/unreleased/antonyliu-i18n-user-profile.yml5
-rw-r--r--changelogs/unreleased/api_make_protected_boolean_type.yml5
-rw-r--r--changelogs/unreleased/api_masked_variables.yml5
-rw-r--r--changelogs/unreleased/asciidoc-include-directive.yml5
-rw-r--r--changelogs/unreleased/auto-devops-kubernestes-bump1-11-10.yml5
-rw-r--r--changelogs/unreleased/backport-schema-changes.yml5
-rw-r--r--changelogs/unreleased/backstage-gb-improve-jobs-controller-performance.yml5
-rw-r--r--changelogs/unreleased/bump-auto-devops-helm-2-14-0.yml5
-rw-r--r--changelogs/unreleased/bvl-comments-graphql.yml5
-rw-r--r--changelogs/unreleased/bvl-graphql-multiplex.yml5
-rw-r--r--changelogs/unreleased/bvl-use-global-ids-graphql.yml5
-rw-r--r--changelogs/unreleased/cancel-auto-merge-when-branch-is-changed.yml5
-rw-r--r--changelogs/unreleased/cancel-auto-merge-when-merge-request-is-closed.yml5
-rw-r--r--changelogs/unreleased/ce-57402-add-issues-statistics-api-endpoints.yml5
-rw-r--r--changelogs/unreleased/ce-jej-fix-git-http-with-sso-enforcement.yml5
-rw-r--r--changelogs/unreleased/ce-quick-fix-58727-collapsed-sidebar-flyout-menu-items-don-t-appear-in-1200px-screen-size.yml5
-rw-r--r--changelogs/unreleased/chore-remove-circuit-breaker-api.yml5
-rw-r--r--changelogs/unreleased/ci-variable-conjunction.yml5
-rw-r--r--changelogs/unreleased/container-registry-api-perms-58271.yml5
-rw-r--r--changelogs/unreleased/copy-button-in-modals.yml5
-rw-r--r--changelogs/unreleased/dhiraj-fix-missing-deployment-rockets-in-monitoring-dashboard.yml5
-rw-r--r--changelogs/unreleased/diff-suggestions-popover.yml5
-rw-r--r--changelogs/unreleased/diff-whitespace-setting-changes.yml5
-rw-r--r--changelogs/unreleased/display-junit-classname-in-modal.yml5
-rw-r--r--changelogs/unreleased/dm-http-hostname-override.yml5
-rw-r--r--changelogs/unreleased/docs-add-chatops-request-doc.yml5
-rw-r--r--changelogs/unreleased/dz-patch-58.yml5
-rw-r--r--changelogs/unreleased/dz-scope-project-routes.yml5
-rw-r--r--changelogs/unreleased/ee-11040-added-conditional-rendering.yml5
-rw-r--r--changelogs/unreleased/ensure_namespace.yml5
-rw-r--r--changelogs/unreleased/error-pipelines-for-blocked-users.yml5
-rw-r--r--changelogs/unreleased/expose-project-git-depth-via-api.yml5
-rw-r--r--changelogs/unreleased/fe-fix-gl-dropdown-scrolling-to-top.yml5
-rw-r--r--changelogs/unreleased/feature-gb-use-gitlabktl-to-build-serverless-applications.yml5
-rw-r--r--changelogs/unreleased/feature-require-2fa-for-all-entities-in-group.yml4
-rw-r--r--changelogs/unreleased/fix-allow-lower-case-issue-ids.yml5
-rw-r--r--changelogs/unreleased/fix-autodevops-postgres-versioning.yml5
-rw-r--r--changelogs/unreleased/fix-db-migrate-is-failed-on-mysql8.yml5
-rw-r--r--changelogs/unreleased/fix-diverged-branch-locals.yml5
-rw-r--r--changelogs/unreleased/fix-flyout-navs.yml5
-rw-r--r--changelogs/unreleased/fix-format-date-safari-ff.yml5
-rw-r--r--changelogs/unreleased/fix-gb-fix-serverless-apps-deployment-template.yml5
-rw-r--r--changelogs/unreleased/fix-gb-remove-serverless-app-build-policies-from-template.yml5
-rw-r--r--changelogs/unreleased/fix-import-member-access.yml5
-rw-r--r--changelogs/unreleased/fix-import-param-ordering.yml5
-rw-r--r--changelogs/unreleased/fix-issue-mr-badge.yml5
-rw-r--r--changelogs/unreleased/fix-milestone-references-with-escaped-html-entities.yml5
-rw-r--r--changelogs/unreleased/fix-pipeline-schedule-owner-is-nil.yml5
-rw-r--r--changelogs/unreleased/fix-search-dropdown-blur-close.yml5
-rw-r--r--changelogs/unreleased/fix-time-window-default.yml5
-rw-r--r--changelogs/unreleased/fix-too-many-loops-cron-error.yml5
-rw-r--r--changelogs/unreleased/generate-spans-for-sections.yml5
-rw-r--r--changelogs/unreleased/gitaly-version-v1.43.0.yml5
-rw-r--r--changelogs/unreleased/gitaly-version-v1.47.0.yml5
-rw-r--r--changelogs/unreleased/gt-externalize-profiles-preferences.yml5
-rw-r--r--changelogs/unreleased/gt-open-visibility-help-link-in-a-new-tab.yml5
-rw-r--r--changelogs/unreleased/hashed-storage-enabled-default.yml5
-rw-r--r--changelogs/unreleased/i18n-active_sessions-in-user-profile.yml5
-rw-r--r--changelogs/unreleased/i18n-chat-of-user-profile.yml5
-rw-r--r--changelogs/unreleased/i18n-email-of-user-profile.yml5
-rw-r--r--changelogs/unreleased/i18n-pgp_ssh_keys-of-user-profile.yml5
-rw-r--r--changelogs/unreleased/id-bug-suggested-changes-remove-empty-line.yml5
-rw-r--r--changelogs/unreleased/ignore-artifact-attirbutes-in-project-import-export.yml5
-rw-r--r--changelogs/unreleased/improve-email-text-part.yml5
-rw-r--r--changelogs/unreleased/increase-move-issue-dropdown-height.yml5
-rw-r--r--changelogs/unreleased/issue-58747.yml5
-rw-r--r--changelogs/unreleased/issue_49897.yml5
-rw-r--r--changelogs/unreleased/jc-migration-for-source-project-id.yml5
-rw-r--r--changelogs/unreleased/jc-omit-count-diverging-commits-max.yml5
-rw-r--r--changelogs/unreleased/jivl-migrate-dashboard-store-vuex.yml5
-rw-r--r--changelogs/unreleased/jupyter_pre_spawn_hook_v2.yml5
-rw-r--r--changelogs/unreleased/kinolaev-master-patch-13154.yml5
-rw-r--r--changelogs/unreleased/leipert-node-12-compatibility.yml5
-rw-r--r--changelogs/unreleased/make-autocomplete-faster-with-lots-of-results.yml5
-rw-r--r--changelogs/unreleased/mark-comment-resolved.yml5
-rw-r--r--changelogs/unreleased/migrate_k8s_service_integration.yml5
-rw-r--r--changelogs/unreleased/mm12935.yml5
-rw-r--r--changelogs/unreleased/osw-avoid-500-on-suggestions-check.yml5
-rw-r--r--changelogs/unreleased/osw-avoid-encoding-errors-on-merge-to-ref-service.yml5
-rw-r--r--changelogs/unreleased/osw-fix-post-dep-migration-with-timeout.yml5
-rw-r--r--changelogs/unreleased/osw-reset-merge-status-from-mergeable-mrs.yml5
-rw-r--r--changelogs/unreleased/patch-55.yml5
-rw-r--r--changelogs/unreleased/patch-65.yml5
-rw-r--r--changelogs/unreleased/patch-issue--56683.yml6
-rw-r--r--changelogs/unreleased/pb-update-gitaly-1-45-0.yml5
-rw-r--r--changelogs/unreleased/pipelines-email-default-branch-filter.yml5
-rw-r--r--changelogs/unreleased/readonly_k8s_integration.yml5
-rw-r--r--changelogs/unreleased/referenced-labels.yml5
-rw-r--r--changelogs/unreleased/relative-urls-for-system-notes.yml5
-rw-r--r--changelogs/unreleased/remove-grafana-dashboard-link-feature-flag.yml5
-rw-r--r--changelogs/unreleased/remove-legacy-artifacts-related-code.yml5
-rw-r--r--changelogs/unreleased/remove-mr-diff-header-height.yml5
-rw-r--r--changelogs/unreleased/revert-concurrent-pipeline-schedule-creation.yml5
-rw-r--r--changelogs/unreleased/security-58856-persistent-xss-in-note-objects.yml5
-rw-r--r--changelogs/unreleased/security-60039.yml5
-rw-r--r--changelogs/unreleased/security-60143-address-xss-issue-in-wiki-links.yml5
-rw-r--r--changelogs/unreleased/security-fix-confidential-issue-label-visibility-master.yml5
-rw-r--r--changelogs/unreleased/security-fix-project-existence-disclosure-master.yml5
-rw-r--r--changelogs/unreleased/security-fix_milestones_search_api_leak.yml5
-rw-r--r--changelogs/unreleased/security-id-leaked-password-in-import-url-frontend.yml5
-rw-r--r--changelogs/unreleased/security-jej-prevent-web-sign-in-bypass.yml5
-rw-r--r--changelogs/unreleased/security-unsubscribing-from-issue.yml5
-rw-r--r--changelogs/unreleased/set-real-next-run-at-for-preventing-duplciate-pipeline-creations.yml5
-rw-r--r--changelogs/unreleased/sh-add-backtrace-to-sql-queries.yml5
-rw-r--r--changelogs/unreleased/sh-add-header-to-jobs-admin-page.yml5
-rw-r--r--changelogs/unreleased/sh-clean-up-bitbucket-import-errors.yml5
-rw-r--r--changelogs/unreleased/sh-default-visibility-fix.yml5
-rw-r--r--changelogs/unreleased/sh-enable-ref-name-caching-discussions.yml5
-rw-r--r--changelogs/unreleased/sh-fix-fogbugz-import.yml5
-rw-r--r--changelogs/unreleased/sh-fix-issue-55869.yml5
-rw-r--r--changelogs/unreleased/sh-fix-issue-63158.yml5
-rw-r--r--changelogs/unreleased/sh-fix-rebase-error-clearing.yml5
-rw-r--r--changelogs/unreleased/sh-fix-resolve-button-not-available.yml5
-rw-r--r--changelogs/unreleased/sh-fix-tag-push-remote-mirror.yml5
-rw-r--r--changelogs/unreleased/sh-fix-utf-8-encoding-resolve-conflicts.yml5
-rw-r--r--changelogs/unreleased/sh-omit-blocked-admins-from-notification.yml5
-rw-r--r--changelogs/unreleased/sh-speed-up-commit-loading.yml5
-rw-r--r--changelogs/unreleased/sh-strong-memoize-appearances.yml5
-rw-r--r--changelogs/unreleased/sh-update-process-mem.yml5
-rw-r--r--changelogs/unreleased/sh-upgrade-ruby-2-6-3-ce.yml5
-rw-r--r--changelogs/unreleased/t1.yml5
-rw-r--r--changelogs/unreleased/thomas-nilsson-irfu-gitlab-ce-thomas-nilsson-irfu-master-patch-13137.yml5
-rw-r--r--changelogs/unreleased/update-babel-to-7-4-4.yml5
-rw-r--r--changelogs/unreleased/update-gitaly-to-v1-42-1.yml5
-rw-r--r--changelogs/unreleased/update-gitlab-runner-helm-chart-to-0-5-0.yml5
-rw-r--r--changelogs/unreleased/update-gitlab-runner-helm-chart-to-0-5-1.yml5
-rw-r--r--changelogs/unreleased/update-gitlab-runner-helm-chart-to-0-5-2.yml5
-rw-r--r--changelogs/unreleased/update-gitlab-shell-9-3-0.yml5
-rw-r--r--changelogs/unreleased/update-pages.yml5
-rw-r--r--changelogs/unreleased/update-pagination-texts.yml5
-rw-r--r--changelogs/unreleased/update-psd-doc.yml5
-rw-r--r--changelogs/unreleased/update-smileys-new.yml5
-rw-r--r--changelogs/unreleased/upgrade-pages-to-v1-6-1.yml5
-rw-r--r--changelogs/unreleased/variables-boolean-type.yml5
-rw-r--r--changelogs/unreleased/visual-review-apps-fix-dropdown.yml5
-rw-r--r--changelogs/unreleased/weimeng-email-routing.yml5
-rw-r--r--changelogs/unreleased/winh-notes-error-handling.yml5
-rw-r--r--changelogs/unreleased/zj-remove-delta-island-feature-flag.yml3
-rw-r--r--changelogs/unreleased/zj-usage-ping-pool-repository.yml5
-rw-r--r--doc/administration/high_availability/README.md6
-rw-r--r--doc/administration/high_availability/database.md23
-rw-r--r--doc/administration/high_availability/gitaly.md25
-rw-r--r--doc/administration/high_availability/gitlab.md45
-rw-r--r--doc/administration/high_availability/monitoring_node.md67
-rw-r--r--doc/administration/high_availability/redis.md28
-rw-r--r--doc/ci/variables/README.md22
-rw-r--r--doc/user/application_security/dependency_scanning/index.md16
-rw-r--r--doc/user/group/index.md7
-rw-r--r--doc/user/project/clusters/index.md4
-rw-r--r--doc/user/project/deploy_boards.md5
-rw-r--r--lib/gitlab/bitbucket_import/importer.rb28
-rw-r--r--lib/gitlab/ci/build/prerequisite/kubernetes_namespace.rb1
-rw-r--r--lib/gitlab/json_cache.rb4
-rw-r--r--lib/gitlab/kubernetes.rb8
-rw-r--r--locale/gitlab.pot19
-rw-r--r--package.json2
-rw-r--r--spec/controllers/projects/clusters_controller_spec.rb2
-rw-r--r--spec/controllers/projects/merge_requests_controller_spec.rb2
-rw-r--r--spec/features/admin/admin_users_spec.rb26
-rw-r--r--spec/features/container_registry_spec.rb4
-rw-r--r--spec/features/projects/clusters/gcp_spec.rb1
-rw-r--r--spec/helpers/appearances_helper_spec.rb16
-rw-r--r--spec/javascripts/jobs/components/stages_dropdown_spec.js8
-rw-r--r--spec/javascripts/pages/labels/components/promote_label_modal_spec.js4
-rw-r--r--spec/javascripts/pages/milestones/shared/components/promote_milestone_modal_spec.js4
-rw-r--r--spec/javascripts/registry/components/collapsible_container_spec.js22
-rw-r--r--spec/javascripts/registry/components/table_registry_spec.js30
-rw-r--r--spec/javascripts/registry/stores/actions_spec.js24
-rw-r--r--spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js14
-rw-r--r--spec/javascripts/vue_shared/components/table_pagination_spec.js4
-rw-r--r--spec/lib/gitlab/bitbucket_import/importer_spec.rb27
-rw-r--r--spec/lib/gitlab/ci/build/prerequisite/kubernetes_namespace_spec.rb6
-rw-r--r--spec/lib/gitlab/json_cache_spec.rb68
-rw-r--r--spec/lib/gitlab/kubernetes_spec.rb24
-rw-r--r--spec/mailers/notify_spec.rb28
-rw-r--r--spec/models/clusters/platforms/kubernetes_spec.rb23
-rw-r--r--spec/services/clusters/gcp/finalize_creation_service_spec.rb10
-rw-r--r--spec/services/clusters/update_service_spec.rb1
-rw-r--r--spec/support/shared_examples/notify_shared_examples.rb14
-rw-r--r--spec/workers/cluster_provision_worker_spec.rb7
-rw-r--r--yarn.lock8
372 files changed, 1033 insertions, 1734 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 623e5d0acb9..8922c5b4938 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,316 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 12.0.0 (2019-06-22)
+
+### Security (10 changes)
+
+- Hide confidential issue title on unsubscribe for anonymous users.
+- Fix url redaction for issue links.
+- Fix confidential issue label disclosure on milestone view.
+- Filter relative links in wiki for XSS.
+- Prevent XSS injection in note imports.
+- Resolve: Milestones leaked via search API.
+- Prevent bypass of restriction disabling web password sign in.
+- Add extra fields for handling basic auth on import by url page.
+- Protect Gitlab::HTTP against DNS rebinding attack.
+- Prevent invalid branch for merge request.
+
+### Removed (5 changes, 1 of them is from the community)
+
+- Remove ability for group clusters to be automatically configured on creation. !27245
+- Removes support for AUTO_DEVOPS_DOMAIN. !28460
+- Remove the circuit breaker API. !28669
+- Make Kubernetes service templates readonly. !29044
+- Remove Content-Type override for Mattermost OAuth login. (Harrison Healey)
+
+### Fixed (116 changes, 28 of them are from the community)
+
+- Fix col-sm-* in forms to keep layout. !24885 (Takuya Noguchi)
+- Avoid 500 when rendering users ATOM data. !25408
+- Fix flyout nav on small viewports. !25998
+- Fix proxy support in Container Scanning. !27246
+- preventing blocked users and their PipelineSchdules from creating new Pipelines. !27318
+- Fix yaml linting for GitLab CI inside project (.gitlab/ci) *.yml files and CI template files. !27576 (Will Hall)
+- Fix yaml linting for project root *.yml files. !27579 (Will Hall)
+- Added a content field to atom feed. !27652
+- Bring secondary button styles up to design standard. !27920
+- Use FindOrCreateService to create labels and check for existing ones. !27987 (Matt Duren)
+- Fix "too many loops" error by handling gracefully cron schedules for non existent days. !28002
+- Handle errors in successful notes reply. !28082
+- Fix 500 error when accessing charts with an anonymous user. !28091 (Diego Silva)
+- Allow user to set primary email first when 2FA is required. !28097 (Kartikey Tanna)
+- Auto-DevOps: allow to disable rollout status check. !28130 (Sergej Nikolaev <kinolaev@gmail.com>)
+- Resolved JIRA service: NoMethodError: undefined method 'find' for nil:NilClass. !28206
+- Supports Matomo/Piwik string website ID ("Protect Track ID" plugin). !28214 (DUVERGIER Claude)
+- Fix loading.. dropdown at search field. !28275 (Pavel Chausov)
+- Remove unintended error message shown when moving issues. !28317
+- Properly clear the merge error upon rebase failure. !28319
+- Upgrade dependencies for node 12 compatibility. !28323
+- Fix. `db:migrate` is failed on MySQL 8. !28351 (sue445)
+- Fix an error in projects admin when statistics are missing. !28355
+- Fix emojis URLs. !28371
+- Prevent common name collisions when requesting multiple Let's Encrypt certificates concurrently. !28373
+- Fix issue that causes "Save changes" button in project settings pages to be enabled/disabled incorrectly when changes are made to the form. !28377
+- Fix diff notes and discussion notes being exported as regular notes. !28401
+- Fix padding in MR widget. !28472
+- Updates loading icon in commits page. !28475
+- Fix border radius of discussions. !28490
+- Update broadcast message action icons. !28496 (Jarek Ostrowski @jareko)
+- Update icon color to match design system, pass accessibility. !28498 (Jarek Ostrowski @jareko)
+- Show data on Cycle Analytics page when value is less than a second. !28507
+- Fix dropdown position when loading remote data. !28526
+- Delete unauthorized Todos when project is made private. !28560
+- Change links in system notes to use relative paths. !28588 (Luke Picciau)
+- Update favicon from next. !28601 (Jarek Ostrowski @jareko)
+- Open visibility help link in a new tab. !28603 (George Tsiolis)
+- Fix issue importing members with owner access. !28636
+- Fix the height of the page headers on issues/merge request/snippets pages. !28650 (Erik van der Gaag)
+- Always show "Pipelines must succeed" checkbox. !28651
+- Resolve moving an issue results in broken image links in comments. !28654
+- Fix milestone references containing &, <, or >. !28667
+- Add hover and focus to Attach a file. !28682
+- Correctly word-wrapping project descriptions with very long words. !28695 (Erik van der Gaag)
+- Prevent icons from shrinking in User popover when contents exceed container. !28696
+- Allow removal of empty lines via suggestions. !28703
+- Throw an error when formatDate's input is invalid. !28713
+- Fix order dependency with user params during imports. !28719
+- Fix search dropdown not closing on blur if empty. !28730
+- Fixed ignored postgres version that occurs after the first autodevops deploy when specifying custom $POSTGRES_VERSION. !28735 (Brandon Dimcheff)
+- Limit milestone dates to before year 9999. !28742 (Luke Picciau)
+- Set project default visibility to max allowed. !28754
+- Cancel auto merge when merge request is closed. !28782
+- Fixes Ref link being displayed as raw HTML in the Pipelines page. !28823
+- Fix job name in graph dropdown overflowing. !28824
+- Add style to disable webkit icons for search inputs. !28833 (Jarek Ostrowski @jareko)
+- Fix email notifications for user excluded actions. !28835
+- Resolve Tooltip Consistency. !28839
+- Fix Merge Request merge checkbox alignment on mobile view. !28845
+- Add referenced-commands in no overflow list. !28858
+- Fix participants list wrapping. !28873
+- Excludes MR author from Review roulette. !28886 (Jacopo Beschi @jacopo-beschi)
+- Give labels consistent weight. !28895
+- Added padding to time window dropdown in monitor dashboard. !28897
+- Move text under p tag. !28901
+- Resolve Position is off when visiting files with anchors. !28913
+- Fix whitespace changes visibility when the related file was initially collapsed. !28950 (Ondřej Budai)
+- Fix emoji picker visibility issue. !28984
+- Resolve Merge request discussion text jumps when resolved. !28995
+- Allow lowercase prefix for Youtrack issue ids. !29057 (Matthias Baur)
+- Add support to view entirety of long branch name in dropdown instead of it being cut off. !29069
+- Fix inconsistent option dropdown button height to match adjacent button. !29096
+- Improve new user email markup unconsistency between text and html parts. !29111 (Haunui Saint-sevin)
+- Eliminate color inconsistencies in metric graphs. !29127
+- Avoid setting Gitlab::Session on sessionless requests and Git HTTP. !29146
+- Use the selected time window for metrics dashboard. !29152
+- Remove build policies from serverless app template. !29253
+- Fix serverless apps deployments by bumping 'tm' version. !29254
+- Include the port in the URLs of the API Link headers. !29267
+- Fix Fogbugz Importer not working. !29383
+- Fix GPG signature verification with recent GnuPG versions. !29388 (David Palubin)
+- Cancel Auto Merge when target branch is changed. !29416
+- Fix nil coercion updating storage size on project statistics. !29425
+- Ignore legacy artifact columns in Project Import/Export. !29427
+- Avoid DB timeouts when scheduling migrations. !29437
+- Handle encoding errors for MergeToRefService. !29440
+- Fix UTF-8 conversion issues when resolving conflicts. !29453
+- Enlarge metrics time-window dropdown links. !29458
+- Remove unnecessary decimals on Metrics chart axis. !29468
+- Fix scrolling to top on assignee change. !29500
+- Allow command/control click to open link in new tab on Merge Request tabs. !29506
+- Omit blocked admins from repository check e-mails. !29507
+- Fix diverged branch locals. !29508
+- Process up to 100 commit messages for references when pushing to a new default branch. !29511 (Fabio Papa)
+- Allow developer role to delete docker tags via container registry API. !29512
+- Fix "Resolve conflicts" button not appearing for some users. !29535
+- Fix: propagate all documented ENV vars to CI when using SAST. !29564
+- AutoDevops function ensure_namespace() now explicitly tests the namespace. !29567 (Jack Lei)
+- Fix sidebar flyout navigation. !29571
+- Fix missing deployment rockets in monitor dashboard. !29574
+- Fix inability to set visibility_level on project via API. !29578
+- Ensure a Kubernetes namespace is not used for deployments if there is no service account token associated with it. !29643
+- Refresh service_account_token for kubernetes_namespaces. !29657
+- Expose all current events properly on services API. !29736 (Zsolt Kovari)
+- Move Dropdown to Stick to MR View App Button. !29767
+- Fix IDE commit using latest ref in branch and overriding contents. !29769
+- Revert concurrent pipeline creation for pipeline schedules. !29794
+- Fix layout of group milestone header.
+- Fix remote mirrors not updating after tag push.
+- Fix padding of unclickable pipeline dropdown items to match links.
+- Change resolve button text to mark comment as resolved.
+- Align system note within discussion with other notes.
+- Fix border radii on diff files and repo files.
+- Fixed show whitespace button not refetching diff content.
+- Fix pipeline schedules when owner is nil.
+
+### Changed (35 changes, 13 of them are from the community)
+
+- Include information if issue was clossed via merge request or commit. !15610 (Michał Zając)
+- Removes duplicated members from api/projects/:id/members/all. !24005 (Jacopo Beschi @jacopo-beschi)
+- Apply the group setting "require 2FA" across all subgroup members as well when changing the group setting. !24965 (rroger)
+- Enable function features for external Knative installations. !27173
+- Remove dind from DAST template. !28083
+- Update registration form to indicate invalid name or username length on input. !28095 (Jiaan Louw)
+- Default masked to false for new variables. !28186
+- Better isolated `Docker.gitlab-ci.yml` to avoid interference with other job configurations. !28213 (lrkwz)
+- Remove the mr_push_options feature flag. !28278
+- Replace Oxygen-Sans font with Noto Sans. !28322
+- Update new smiley icons, find n replace old names with new ones. !28338 (Jarek Ostrowski)
+- Adds a text label to color pickers to improve accessibility. !28343 (Chris Toynbee)
+- Prioritize login form on mobile breakpoint. !28360
+- Move some project routes under /-/ scope. !28435
+- I18n for issue closure reason in emails. !28489 (Michał Zając)
+- Geo: Remove Gitlab::LfsToken::LegacyRedisDeviseToken implementation and usage. !28546
+- Add check circle filled icon for resolved comments. !28663
+- Update project security dashboard documentation. !28681
+- Remove `docker pull` prefix when copying a tag from the registry. !28757 (Benedikt Franke)
+- Adjust milestone completion rate to be based on issues count. !28777
+- Enhance line-height of Activity feed UI. !28856 (Jacopo Beschi @jacopo-beschi)
+- Upgrade to Gitaly v1.43.0. !28867
+- Do not display Update app button when saving Knative domain name. !28904
+- Rebrush of flash-warning according to the new design (brighter background and darker font). !28916 (Michel Engelen)
+- Added reference, web_path, and relative_position fields to GraphQL Issue. !28998
+- Change logic behind cycle analytics. !29018
+- Add documentation links for confidental and locked discussions. !29073
+- Update GITALY_SERVER_VERSION to 1.45.0. !29109
+- Allow masking if 8 or more characters in base64. !29143 (thomas-nilsson-irfu)
+- Replaces sidekiq mtail metrics with ruby instrumentation metrics. !29215
+- Allow references to labels and milestones to contain emoji. !29284
+- changed the styles on `Add List` dropdown to look more like the EE vesion. !29338 (Michel Engelen)
+- Hashed Storage is enabled by default on new installations. !29586
+- Upgrade to Gitaly v1.47.0. !29789
+- Default MR checkbox to true in most cases.
+
+### Performance (11 changes)
+
+- Improve performance of jobs controller. !28093
+- Upgrade Ruby version to 2.6.3. !28117
+- Make pipeline schedule worker resilient. !28407
+- Fix performance issue with large Markdown content in issue or merge request description. !28597
+- Improve clone performance by using delta islands. !28871
+- Reduce Gitaly calls to improve performance when rendering suggestions. !29027
+- Use Redis for CacheMarkDownField on non AR models. !29054
+- Add index on public_email for users. !29430
+- Speed up commit loads by disabling BatchLoader replace_methods. !29633
+- Add index on invite_email for members. !29768
+- Improve performance of users autocomplete when there are lots of results.
+
+### Added (47 changes, 12 of them are from the community)
+
+- Added option to filter jobs by age in the /job/request API endpoint. !1340 (Dmitry Chepurovskiy)
+- Add ability to define notification email addresses for groups you belong to. !25299
+- Add wiki size to project statistics. !25321 (Peter Marko)
+- 58404 - setup max depth for GraphQL. !25737 (Ken Ding)
+- Add auto SSL toggle option to Pages domain settings page. !26438
+- Empty project state for Web IDE. !26556
+- Add support for multiple job parents in GitLab CI YAML. !26801 (Wolphin (Nikita))
+- Pass user's identity and token from JupyterHub to user's Jupyter environment. !27314 (Amit Rathi)
+- Add issues_statistics api endpoints and extend issues search api. !27366
+- Validate Kubernetes credentials at cluster creation. !27403
+- Update the merge request widget's "Merge" button to support merge trains. !27594
+- Style the toast component according to design specs. !27734
+- Add API support for committing changes to different projects in same fork network. !27915
+- Add support for && and || to CI Pipeline Expressions. Change CI variable expression matching for Lexeme::Pattern to eagerly return tokens. !27925 (Martin Manelli)
+- Added ref querystring parameter to project search API to allow searching on branches/tags other than the default. !28069 (Lee Tickett)
+- Add notify_only_default_branch option to PipelinesEmailService. !28271 (Peter Marko)
+- Support multiplex GraphQL queries. !28273
+- Add Namespace and ProjectStatistics to GraphQL API. !28277
+- Display classname JUnit attribute in report modal. !28376
+- API: Allow to get and set "masked" attribute for variables. !28381 (Mathieu Parent)
+- Add allow_failure attribute to Job API. !28406
+- Add support for AsciiDoc include directive. !28417 (Jakub Jirutka & Guillaume Grossetie)
+- Migrate Kubernetes service integration templates to clusters. !28534
+- Allow issue list to be sorted by relative order. !28566
+- Implement borderless discussion design with new reply field. !28580
+- Add expand/collapse to error tracking settings. !28619
+- Adds collapsible sections for job log. !28642
+- Add LFS oid to GraphQL blob type. !28666
+- Allow users to specify a time range on metrics dashboard. !28670
+- Add a New Copy Button That Works in Modals. !28676
+- Add Kubernetes logs to Admin Logs UI. !28685
+- Set up git client in Jupyter installtion. !28783 (Amit Rathi)
+- Add task count and completed count to responses of Issue and MR. !28859
+- Add project level git depth CI/CD setting. !28919
+- Use global IDs when exposing GraphQL resources. !29080
+- Expose wiki_size on GraphQL API. !29123
+- Expose notes and discussions in GraphQL. !29212
+- Use to 'gitlabktl' build serverless applications. !29258
+- Adds pagination component for graphql api. !29277
+- Allow switching clusters between managed and unmanaged. !29322
+- Get and edit ci_default_git_depth via project API. !29353
+- Link to an external dashboard from metrics dashboard. !29369
+- Add labels to note event payload. !29384 (Sujay Patel)
+- Add Join meeting button to issues with Zoom links. !29454
+- Make task completion status available via GraphQL.
+- Add backtraces to Peek performance bar for SQL calls.
+- Added diff suggestion feature discovery popover.
+
+### Other (62 changes, 14 of them are from the community)
+
+- Unified EE/CS differences in repository/show.html. !13562
+- Remove legacy artifact related code. !26475
+- Backport the EE schema and migrations to CE. !26940 (Yorick Peterse)
+- Add dedicated logging for GraphQL queries. !27885
+- i18n: externalize strings from user profile settings. !28088 (Antony Liu)
+- Omit max-count for diverging_commit_counts behind feature flag. !28157
+- Fix alignment of resend button in members page. !28202
+- Update indirect dependency fsevents from 1.2.4 to 1.2.9. !28220 (Takuya Noguchi)
+- Update get_process_mem to 0.2.3. !28248
+- Add Pool repository to the usage ping. !28267
+- Forbid NULL in project_statistics.packages_size. !28400
+- Update Gitaly to v1.42.1. !28425
+- Upgrade babel to 7.4.4. !28437 (Takuya Noguchi)
+- Externalize profiles preferences. !28470 (George Tsiolis)
+- Update GitLab Runner Helm Chart to 0.5.0. !28497
+- Change collapse icon size to size of profile picture. !28512
+- Resolve Snippet icon button is misaligned. !28522
+- Bumps Kubernetes in Auto DevOps to 1.11.10. !28525
+- Bump Helm version in Auto-DevOps.gitlab-ci.yml to 2.14.0. !28527
+- Migrate the monitoring dashboard store to vuex. !28555
+- Give New Snippet button green outline. !28559
+- Removes project_auto_devops#domain column. !28574
+- Externalize strings of email page in user profile. !28587 (antony liu)
+- Externalize strings of active sessions page in user profile. !28590 (antony liu)
+- Refactor and abstract Auto Merge Processes. !28595
+- Add section to dev docs on accessing chatops. !28623
+- Externalize strings of chat page in user profile. !28632
+- Externalize strings of PGP Keys and SSH Keys page in user profile. !28653 (Antony Liu)
+- Added the `.extended-height` class to the labels-dropdown. !28659 (Michel Engelen)
+- Moved EE/CE code differences for `app/assets/javascripts/gl_dropdown.js` into CE. !28711 (Michel Engelen)
+- Update GitLab Runner Helm Chart to 0.5.1. !28720
+- Remove support for using Geo with an installation from source. !28737
+- API: change masked attribute type to Boolean. !28758
+- API: change protected attribute type to Boolean. !28766
+- Add a column header to admin/jobs page. !28837
+- Reset merge status from mergeable MRs. !28843
+- Show tooltip on truncated commit title. !28865 (Timofey Trofimov)
+- Added conditional rendering to `app/views/search/_form.html.haml` for CE/EE code base consistency. !28883 (Michel Engelen)
+- Change "Report abuse to GitLab" to more generic wording. !28884 (Marc Schwede)
+- Update GitLab Pages to v1.6.0. !29048
+- Update GitLab Runner Helm Chart to 0.5.2. !29050
+- User link styling for commits. !29150
+- Fix null source_project_id in pool_repositories. !29157
+- Add deletion protection setting column to application_settings table. !29268
+- Added code differnces from EE in file 'app/assets/javascripts/pages/projects/project.js' to CE. !29271 (Michel Engelen)
+- Update to GitLab Shell v9.3.0. !29283
+- Document when milestones and labels links are missing. !29355
+- Make margin between buttons consistent. !29378
+- Changed the 'Created' label to 'Last Updated' on the container registry table to more accurately reflect what the date represents. !29464
+- Update GitLab Pages to v1.6.1. !29559
+- Indent collapsible sections. !29804
+- Group download buttons into a .btn-group.
+- Change default color of award emoji button.
+- Use blue for activity stream links; use monospace font for commit sha.
+- Remove fixed height from MR diff headers.
+- Moves the table pagination shared component.
+- Add warning that gitlab-secrets isn't included in backup.
+- Update merge request tabs so they no longer scroll.
+- Reduce height of issue board input to align with buttons.
+- Increase height of move issue dropdown.
+- Use grid and correct border radius for status badge.
+- Moves snowplow to CE repo.
+
+
## 11.11.3 (2019-06-10)
### Fixed (5 changes)
diff --git a/VERSION b/VERSION
index 11bf1ec035c..6edc7fa8d35 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.0.0-pre
+12.1.0-pre
diff --git a/app/assets/javascripts/environments/components/container.vue b/app/assets/javascripts/environments/components/container.vue
index f8a637138ad..426bb63d4f7 100644
--- a/app/assets/javascripts/environments/components/container.vue
+++ b/app/assets/javascripts/environments/components/container.vue
@@ -57,6 +57,7 @@ export default {
:user-callouts-path="userCalloutsPath"
:lock-promotion-svg-path="lockPromotionSvgPath"
:help-canary-deployments-path="helpCanaryDeploymentsPath"
+ :deploy-boards-help-path="deployBoardsHelpPath"
/>
<table-pagination
diff --git a/app/assets/javascripts/environments/components/environments_app.vue b/app/assets/javascripts/environments/components/environments_app.vue
index ec78240217b..81927d18f8b 100644
--- a/app/assets/javascripts/environments/components/environments_app.vue
+++ b/app/assets/javascripts/environments/components/environments_app.vue
@@ -43,6 +43,11 @@ export default {
type: String,
required: true,
},
+ deployBoardsHelpPath: {
+ type: String,
+ required: false,
+ default: '',
+ },
},
created() {
@@ -112,6 +117,7 @@ export default {
:user-callouts-path="userCalloutsPath"
:lock-promotion-svg-path="lockPromotionSvgPath"
:help-canary-deployments-path="helpCanaryDeploymentsPath"
+ :deploy-boards-help-path="deployBoardsHelpPath"
@onChangePage="onChangePage"
>
<empty-state
diff --git a/app/assets/javascripts/environments/components/environments_table.vue b/app/assets/javascripts/environments/components/environments_table.vue
index 55613d815ce..4464f5e5578 100644
--- a/app/assets/javascripts/environments/components/environments_table.vue
+++ b/app/assets/javascripts/environments/components/environments_table.vue
@@ -22,6 +22,11 @@ export default {
required: true,
default: () => [],
},
+ deployBoardsHelpPath: {
+ type: String,
+ required: false,
+ default: '',
+ },
canReadEnvironment: {
type: Boolean,
required: false,
@@ -106,8 +111,10 @@ export default {
<div class="deploy-board-container">
<deploy-board
:deploy-board-data="model.deployBoardData"
+ :deploy-boards-help-path="deployBoardsHelpPath"
:is-loading="model.isLoadingDeployBoard"
:is-empty="model.isEmptyDeployBoard"
+ :has-legacy-app-label="model.hasLegacyAppLabel"
:logs-path="model.logs_path"
/>
</div>
diff --git a/app/assets/javascripts/environments/index.js b/app/assets/javascripts/environments/index.js
index b53d42f202b..dcdaf8731f8 100644
--- a/app/assets/javascripts/environments/index.js
+++ b/app/assets/javascripts/environments/index.js
@@ -20,6 +20,7 @@ export default () =>
endpoint: environmentsData.environmentsDataEndpoint,
newEnvironmentPath: environmentsData.newEnvironmentPath,
helpPagePath: environmentsData.helpPagePath,
+ deployBoardsHelpPath: environmentsData.deployBoardsHelpPath,
cssContainerClass: environmentsData.cssClass,
canCreateEnvironment: parseBoolean(environmentsData.canCreateEnvironment),
canReadEnvironment: parseBoolean(environmentsData.canReadEnvironment),
@@ -31,6 +32,7 @@ export default () =>
endpoint: this.endpoint,
newEnvironmentPath: this.newEnvironmentPath,
helpPagePath: this.helpPagePath,
+ deployBoardsHelpPath: this.deployBoardsHelpPath,
cssContainerClass: this.cssContainerClass,
canCreateEnvironment: this.canCreateEnvironment,
canReadEnvironment: this.canReadEnvironment,
diff --git a/app/assets/javascripts/environments/mixins/container_mixin.js b/app/assets/javascripts/environments/mixins/container_mixin.js
index f2907c120f8..abf7d33be91 100644
--- a/app/assets/javascripts/environments/mixins/container_mixin.js
+++ b/app/assets/javascripts/environments/mixins/container_mixin.js
@@ -25,5 +25,10 @@ export default {
required: false,
default: null,
},
+ deployBoardsHelpPath: {
+ type: String,
+ required: false,
+ default: '',
+ },
},
};
diff --git a/app/assets/javascripts/gfm_auto_complete.js b/app/assets/javascripts/gfm_auto_complete.js
index 0af9aabd8cf..3b73dd83c9f 100644
--- a/app/assets/javascripts/gfm_auto_complete.js
+++ b/app/assets/javascripts/gfm_auto_complete.js
@@ -201,9 +201,7 @@ class GfmAutoComplete {
const autoCompleteAvatar = m.avatar_url || m.username.charAt(0).toUpperCase();
const rectAvatarClass = m.type === GROUP_TYPE ? 'rect-avatar' : '';
- const imgAvatar = `<img src="${m.avatar_url}" alt="${
- m.username
- }" class="avatar ${rectAvatarClass} avatar-inline center s26"/>`;
+ const imgAvatar = `<img src="${m.avatar_url}" alt="${m.username}" class="avatar ${rectAvatarClass} avatar-inline center s26"/>`;
const txtAvatar = `<div class="avatar ${rectAvatarClass} center avatar-inline s26">${autoCompleteAvatar}</div>`;
return {
diff --git a/app/assets/javascripts/groups_select.js b/app/assets/javascripts/groups_select.js
index a1263d1cdab..f1cc6756583 100644
--- a/app/assets/javascripts/groups_select.js
+++ b/app/assets/javascripts/groups_select.js
@@ -77,9 +77,7 @@ export default function groupsSelect() {
}
},
formatResult(object) {
- return `<div class='group-result'> <div class='group-name'>${
- object.full_name
- }</div> <div class='group-path'>${object.full_path}</div> </div>`;
+ return `<div class='group-result'> <div class='group-name'>${object.full_name}</div> <div class='group-path'>${object.full_path}</div> </div>`;
},
formatSelection(object) {
return object.full_name;
diff --git a/app/assets/javascripts/ide/stores/modules/commit/actions.js b/app/assets/javascripts/ide/stores/modules/commit/actions.js
index ff1255ce749..01ca6a6b12f 100644
--- a/app/assets/javascripts/ide/stores/modules/commit/actions.js
+++ b/app/assets/javascripts/ide/stores/modules/commit/actions.js
@@ -63,9 +63,7 @@ export const setLastCommitMessage = ({ commit, rootGetters }, data) => {
const commitMsg = sprintf(
__('Your changes have been committed. Commit %{commitId} %{commitStats}'),
{
- commitId: `<a href="${currentProject.web_url}/commit/${data.short_id}" class="commit-sha">${
- data.short_id
- }</a>`,
+ commitId: `<a href="${currentProject.web_url}/commit/${data.short_id}" class="commit-sha">${data.short_id}</a>`,
commitStats,
},
false,
@@ -215,9 +213,7 @@ export const commitChanges = ({ commit, state, getters, dispatch, rootState, roo
if (rootGetters.activeFile) {
router.push(
- `/project/${rootState.currentProjectId}/blob/${getters.branchName}/-/${
- rootGetters.activeFile.path
- }`,
+ `/project/${rootState.currentProjectId}/blob/${getters.branchName}/-/${rootGetters.activeFile.path}`,
);
}
}
diff --git a/app/assets/javascripts/jobs/components/environments_block.vue b/app/assets/javascripts/jobs/components/environments_block.vue
index f7fbb9503a0..132e50e5715 100644
--- a/app/assets/javascripts/jobs/components/environments_block.vue
+++ b/app/assets/javascripts/jobs/components/environments_block.vue
@@ -86,9 +86,7 @@ export default {
return sprintf(
'%{startLink}%{name}%{endLink}',
{
- startLink: `<a href="${
- this.deploymentStatus.environment.environment_path
- }" class="js-environment-link">`,
+ startLink: `<a href="${this.deploymentStatus.environment.environment_path}" class="js-environment-link">`,
name: _.escape(this.deploymentStatus.environment.name),
endLink: '</a>',
},
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
index a7156bd2406..9cc31e26648 100644
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -1284,9 +1284,7 @@ export default class Notes {
putConflictEditWarningInPlace(noteEntity, $note) {
if ($note.find('.js-conflict-edit-warning').length === 0) {
- const open_link = `<a href="#note_${
- noteEntity.id
- }" target="_blank" rel="noopener noreferrer">`;
+ const open_link = `<a href="#note_${noteEntity.id}" target="_blank" rel="noopener noreferrer">`;
const $alert = $(`<div class="js-conflict-edit-warning alert alert-danger">
${sprintf(
s__(
diff --git a/app/assets/javascripts/pages/profiles/two_factor_auths/index.js b/app/assets/javascripts/pages/profiles/two_factor_auths/index.js
index 10cd8ecfbc9..820f0f7f12d 100644
--- a/app/assets/javascripts/pages/profiles/two_factor_auths/index.js
+++ b/app/assets/javascripts/pages/profiles/two_factor_auths/index.js
@@ -6,9 +6,7 @@ document.addEventListener('DOMContentLoaded', () => {
const twoFactorNode = document.querySelector('.js-two-factor-auth');
const skippable = parseBoolean(twoFactorNode.dataset.twoFactorSkippable);
if (skippable) {
- const button = `<a class="btn btn-sm btn-warning float-right" data-method="patch" href="${
- twoFactorNode.dataset.two_factor_skip_url
- }">Configure it later</a>`;
+ const button = `<a class="btn btn-sm btn-warning float-right" data-method="patch" href="${twoFactorNode.dataset.two_factor_skip_url}">Configure it later</a>`;
const flashAlert = document.querySelector('.flash-alert .container-fluid');
if (flashAlert) flashAlert.insertAdjacentHTML('beforeend', button);
}
diff --git a/app/assets/javascripts/registry/components/app.vue b/app/assets/javascripts/registry/components/app.vue
index 9af5660f764..ee973017387 100644
--- a/app/assets/javascripts/registry/components/app.vue
+++ b/app/assets/javascripts/registry/components/app.vue
@@ -33,7 +33,7 @@ export default {
</script>
<template>
<div>
- <gl-loading-icon v-if="isLoading" :size="3" />
+ <gl-loading-icon v-if="isLoading" size="md" />
<collapsible-container
v-for="item in repos"
@@ -45,7 +45,7 @@ export default {
<p v-else-if="!isLoading && !repos.length">
{{
__(`No container images stored for this project.
-Add one by following the instructions above.`)
+ Add one by following the instructions above.`)
}}
</p>
</div>
diff --git a/app/assets/javascripts/registry/components/collapsible_container.vue b/app/assets/javascripts/registry/components/collapsible_container.vue
index 5451c61026c..1e266dd4ced 100644
--- a/app/assets/javascripts/registry/components/collapsible_container.vue
+++ b/app/assets/javascripts/registry/components/collapsible_container.vue
@@ -1,6 +1,6 @@
<script>
import { mapActions } from 'vuex';
-import { GlLoadingIcon, GlButton, GlTooltipDirective } from '@gitlab/ui';
+import { GlLoadingIcon, GlButton, GlTooltipDirective, GlModal, GlModalDirective } from '@gitlab/ui';
import createFlash from '../../flash';
import ClipboardButton from '../../vue_shared/components/clipboard_button.vue';
import Icon from '../../vue_shared/components/icon.vue';
@@ -16,9 +16,11 @@ export default {
GlLoadingIcon,
GlButton,
Icon,
+ GlModal,
},
directives: {
GlTooltip: GlTooltipDirective,
+ GlModal: GlModalDirective,
},
props: {
repo: {
@@ -37,7 +39,7 @@ export default {
},
},
methods: {
- ...mapActions(['fetchRepos', 'fetchList', 'deleteRepo']),
+ ...mapActions(['fetchRepos', 'fetchList', 'deleteItem']),
toggleRepo() {
this.isOpen = !this.isOpen;
@@ -46,7 +48,7 @@ export default {
}
},
handleDeleteRepository() {
- this.deleteRepo(this.repo)
+ this.deleteItem(this.repo)
.then(() => {
createFlash(__('This container registry has been scheduled for deletion.'), 'notice');
this.fetchRepos();
@@ -78,18 +80,18 @@ export default {
<gl-button
v-if="repo.canDelete"
v-gl-tooltip
+ v-gl-modal="'confirm-repo-deletion-modal'"
:title="s__('ContainerRegistry|Remove repository')"
:aria-label="s__('ContainerRegistry|Remove repository')"
class="js-remove-repo"
variant="danger"
- @click="handleDeleteRepository"
>
<icon name="remove" />
</gl-button>
</div>
</div>
- <gl-loading-icon v-if="repo.isLoading" :size="2" class="append-bottom-20" />
+ <gl-loading-icon v-if="repo.isLoading" size="md" class="append-bottom-20" />
<div v-else-if="!repo.isLoading && isOpen" class="container-image-tags">
<table-registry v-if="repo.list.length" :repo="repo" />
@@ -98,5 +100,24 @@ export default {
{{ s__('ContainerRegistry|No tags in Container Registry for this container image.') }}
</div>
</div>
+
+ <gl-modal
+ modal-id="confirm-repo-deletion-modal"
+ ok-variant="danger"
+ @ok="handleDeleteRepository"
+ >
+ <template v-slot:modal-title>{{ s__('ContainerRegistry|Remove repository') }}</template>
+ <p
+ v-html="
+ sprintf(
+ s__(
+ 'ContainerRegistry|You are about to remove repository <b>%{title}</b>. Once you confirm, this repository will be permanently deleted.',
+ ),
+ { title: repo.name },
+ )
+ "
+ ></p>
+ <template v-slot:modal-ok>{{ __('Remove') }}</template>
+ </gl-modal>
</div>
</template>
diff --git a/app/assets/javascripts/registry/components/table_registry.vue b/app/assets/javascripts/registry/components/table_registry.vue
index f535b2ae9f2..0ec5e2c7a87 100644
--- a/app/assets/javascripts/registry/components/table_registry.vue
+++ b/app/assets/javascripts/registry/components/table_registry.vue
@@ -1,6 +1,6 @@
<script>
import { mapActions } from 'vuex';
-import { GlButton, GlTooltipDirective } from '@gitlab/ui';
+import { GlButton, GlTooltipDirective, GlModal, GlModalDirective } from '@gitlab/ui';
import { n__ } from '../../locale';
import createFlash from '../../flash';
import ClipboardButton from '../../vue_shared/components/clipboard_button.vue';
@@ -16,9 +16,11 @@ export default {
TablePagination,
GlButton,
Icon,
+ GlModal,
},
directives: {
GlTooltip: GlTooltipDirective,
+ GlModal: GlModalDirective,
},
mixins: [timeagoMixin],
props: {
@@ -27,21 +29,31 @@ export default {
required: true,
},
},
+ data() {
+ return {
+ itemToBeDeleted: null,
+ };
+ },
computed: {
shouldRenderPagination() {
return this.repo.pagination.total > this.repo.pagination.perPage;
},
},
methods: {
- ...mapActions(['fetchList', 'deleteRegistry']),
+ ...mapActions(['fetchList', 'deleteItem']),
layers(item) {
return item.layers ? n__('%d layer', '%d layers', item.layers) : '';
},
formatSize(size) {
return numberToHumanSize(size);
},
- handleDeleteRegistry(registry) {
- this.deleteRegistry(registry)
+ setItemToBeDeleted(item) {
+ this.itemToBeDeleted = item;
+ },
+ handleDeleteRegistry() {
+ const { itemToBeDeleted } = this;
+ this.itemToBeDeleted = null;
+ this.deleteItem(itemToBeDeleted)
.then(() => this.fetchList({ repo: this.repo }))
.catch(() => this.showError(errorMessagesTypes.DELETE_REGISTRY));
},
@@ -80,9 +92,9 @@ export default {
/>
</td>
<td>
- <span v-gl-tooltip.bottom class="monospace" :title="item.revision">{{
- item.shortRevision
- }}</span>
+ <span v-gl-tooltip.bottom class="monospace" :title="item.revision">
+ {{ item.shortRevision }}
+ </span>
</td>
<td>
{{ formatSize(item.size) }}
@@ -93,20 +105,21 @@ export default {
</td>
<td>
- <span v-gl-tooltip.bottom :title="tooltipTitle(item.createdAt)">{{
- timeFormated(item.createdAt)
- }}</span>
+ <span v-gl-tooltip.bottom :title="tooltipTitle(item.createdAt)">
+ {{ timeFormated(item.createdAt) }}
+ </span>
</td>
<td class="content">
<gl-button
v-if="item.canDelete"
v-gl-tooltip
- :title="s__('ContainerRegistry|Remove tag')"
- :aria-label="s__('ContainerRegistry|Remove tag')"
+ v-gl-modal="'confirm-image-deletion-modal'"
+ :title="s__('ContainerRegistry|Remove image')"
+ :aria-label="s__('ContainerRegistry|Remove image')"
variant="danger"
class="js-delete-registry d-none d-sm-block float-right"
- @click="handleDeleteRegistry(item)"
+ @click="setItemToBeDeleted(item)"
>
<icon name="remove" />
</gl-button>
@@ -120,5 +133,24 @@ export default {
:change="onPageChange"
:page-info="repo.pagination"
/>
+
+ <gl-modal
+ modal-id="confirm-image-deletion-modal"
+ ok-variant="danger"
+ @ok="handleDeleteRegistry"
+ >
+ <template v-slot:modal-title>{{ s__('ContainerRegistry|Remove image') }}</template>
+ <template v-slot:modal-ok>{{ s__('ContainerRegistry|Remove image and tags') }}</template>
+ <p
+ v-html="
+ sprintf(
+ s__(
+ 'ContainerRegistry|You are about to delete the image <b>%{title}</b>. This will delete the image and all tags pointing to this image.',
+ ),
+ { title: repo.name },
+ )
+ "
+ ></p>
+ </gl-modal>
</div>
</template>
diff --git a/app/assets/javascripts/registry/stores/actions.js b/app/assets/javascripts/registry/stores/actions.js
index 51d057c62c1..0f5e9cc73a0 100644
--- a/app/assets/javascripts/registry/stores/actions.js
+++ b/app/assets/javascripts/registry/stores/actions.js
@@ -35,11 +35,7 @@ export const fetchList = ({ commit }, { repo, page }) => {
});
};
-// eslint-disable-next-line no-unused-vars
-export const deleteRepo = ({ commit }, repo) => axios.delete(repo.destroyPath);
-
-// eslint-disable-next-line no-unused-vars
-export const deleteRegistry = ({ commit }, image) => axios.delete(image.destroyPath);
+export const deleteItem = (_, item) => axios.delete(item.destroyPath);
export const setMainEndpoint = ({ commit }, data) => commit(types.SET_MAIN_ENDPOINT, data);
export const toggleLoading = ({ commit }) => commit(types.TOGGLE_MAIN_LOADING);
diff --git a/app/assets/javascripts/vue_shared/components/modal_copy_button.vue b/app/assets/javascripts/vue_shared/components/modal_copy_button.vue
index bf59a6abf3f..edbeab9c600 100644
--- a/app/assets/javascripts/vue_shared/components/modal_copy_button.vue
+++ b/app/assets/javascripts/vue_shared/components/modal_copy_button.vue
@@ -26,6 +26,11 @@ export default {
required: false,
default: '',
},
+ cssClasses: {
+ type: String,
+ required: false,
+ default: '',
+ },
modalId: {
type: String,
required: false,
@@ -110,6 +115,7 @@ export default {
<template>
<gl-button
v-gl-tooltip="{ placement: tooltipPlacement, container: tooltipContainer }"
+ :class="cssClasses"
:data-clipboard-target="target"
:data-clipboard-text="text"
:title="title"
diff --git a/app/assets/javascripts/vue_shared/components/pagination/constants.js b/app/assets/javascripts/vue_shared/components/pagination/constants.js
index 748ad178c70..229132c0e33 100644
--- a/app/assets/javascripts/vue_shared/components/pagination/constants.js
+++ b/app/assets/javascripts/vue_shared/components/pagination/constants.js
@@ -3,8 +3,8 @@ import { s__ } from '~/locale';
export const PAGINATION_UI_BUTTON_LIMIT = 4;
export const UI_LIMIT = 6;
export const SPREAD = '...';
-export const PREV = s__('Pagination|Prev');
-export const NEXT = s__('Pagination|Next');
+export const PREV = s__('Pagination|‹ Prev');
+export const NEXT = s__('Pagination|Next ›');
export const FIRST = s__('Pagination|« First');
export const LAST = s__('Pagination|Last »');
export const LABEL_FIRST_PAGE = s__('Pagination|Go to first page');
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 9e7e3ed5afb..2695f8a3192 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -16,7 +16,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
before_action :authenticate_user!, only: [:assign_related_issues]
before_action :check_user_can_push_to_source_branch!, only: [:rebase]
- around_action :allow_gitaly_ref_name_caching, only: [:index, :show]
+ around_action :allow_gitaly_ref_name_caching, only: [:index, :show, :discussions]
def index
@merge_requests = @issuables
diff --git a/app/helpers/appearances_helper.rb b/app/helpers/appearances_helper.rb
index c0db9910143..6b43d52c775 100644
--- a/app/helpers/appearances_helper.rb
+++ b/app/helpers/appearances_helper.rb
@@ -2,6 +2,7 @@
module AppearancesHelper
include MarkupHelper
+ include Gitlab::Utils::StrongMemoize
def brand_title
current_appearance&.title.presence || default_brand_title
@@ -25,7 +26,9 @@ module AppearancesHelper
end
def current_appearance
- @appearance ||= Appearance.current
+ strong_memoize(:current_appearance) do
+ Appearance.current
+ end
end
def brand_header_logo
diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb
index 2afe471d1cc..5afb193cf86 100644
--- a/app/models/clusters/platforms/kubernetes.rb
+++ b/app/models/clusters/platforms/kubernetes.rb
@@ -47,7 +47,6 @@ module Clusters
validate :prevent_modification, on: :update
after_save :clear_reactive_cache!
- after_update :update_kubernetes_namespace
alias_attribute :ca_pem, :ca_cert
@@ -210,14 +209,6 @@ module Clusters
true
end
-
- def update_kubernetes_namespace
- return unless saved_change_to_namespace?
-
- run_after_commit do
- ClusterConfigureWorker.perform_async(cluster_id)
- end
- end
end
end
end
diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index 92c7311014a..ee6e830d3ec 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -179,7 +179,7 @@ class Deployment < ApplicationRecord
end
def has_metrics?
- prometheus_adapter&.can_query? && success?
+ success? && prometheus_adapter&.can_query?
end
def metrics
diff --git a/app/models/environment.rb b/app/models/environment.rb
index aff20dae09b..1f7e8815c8e 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -155,7 +155,7 @@ class Environment < ApplicationRecord
end
def has_terminals?
- deployment_platform.present? && available? && last_deployment.present?
+ available? && deployment_platform.present? && last_deployment.present?
end
def terminals
@@ -163,7 +163,7 @@ class Environment < ApplicationRecord
end
def has_metrics?
- prometheus_adapter&.can_query? && available?
+ available? && prometheus_adapter&.can_query?
end
def metrics
diff --git a/app/models/project.rb b/app/models/project.rb
index 7851f37116c..351d08eaf63 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -55,6 +55,8 @@ class Project < ApplicationRecord
VALID_MIRROR_PORTS = [22, 80, 443].freeze
VALID_MIRROR_PROTOCOLS = %w(http https ssh git).freeze
+ ignore_column :import_status, :import_jid, :import_error
+
cache_markdown_field :description, pipeline: :description
delegate :feature_available?, :builds_enabled?, :wiki_enabled?,
diff --git a/app/services/clusters/gcp/finalize_creation_service.rb b/app/services/clusters/gcp/finalize_creation_service.rb
index 5525c1b9b7f..2f3c1df7651 100644
--- a/app/services/clusters/gcp/finalize_creation_service.rb
+++ b/app/services/clusters/gcp/finalize_creation_service.rb
@@ -12,9 +12,6 @@ module Clusters
create_gitlab_service_account!
configure_kubernetes
cluster.save!
-
- ClusterConfigureWorker.perform_async(cluster.id)
-
rescue Google::Apis::ServerError, Google::Apis::ClientError, Google::Apis::AuthorizationError => e
log_service_error(e.class.name, provider.id, e.message)
provider.make_errored!(s_('ClusterIntegration|Failed to request to Google Cloud Platform: %{message}') % { message: e.message })
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index dcd6f7c8078..5c6131db37d 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -32,11 +32,12 @@
%li
%span.light Email:
%strong
- = mail_to @user.email
+ = render partial: 'shared/email_with_badge', locals: { email: mail_to(@user.email), verified: @user.confirmed? }
- @user.emails.each do |email|
%li
%span.light Secondary email:
- %strong= email.email
+ %strong
+ = render partial: 'shared/email_with_badge', locals: { email: email.email, verified: email.confirmed? }
= link_to remove_email_admin_user_path(@user, email), data: { confirm: "Are you sure you want to remove #{email.email}?" }, method: :delete, class: "btn-sm btn btn-remove float-right", title: 'Remove secondary email', id: "remove_email_#{email.id}" do
%i.fa.fa-times
%li
diff --git a/app/views/notify/_note_email.html.haml b/app/views/notify/_note_email.html.haml
index 83c7f548975..dc5529b489b 100644
--- a/app/views/notify/_note_email.html.haml
+++ b/app/views/notify/_note_email.html.haml
@@ -5,27 +5,21 @@
- discussion = note.discussion if note.part_of_discussion?
-- if discussion
- %p{ style: "color: #777777;" }
- = succeed ':' do
- = link_to note.author_name, user_url(note.author)
+%p{ style: "color: #777777;" }
+ = succeed ':' do
+ = link_to note.author_name, user_url(note.author)
+ - if discussion.nil?
+ commented
+ - else
+ - if discussion.new_discussion?
+ started a new
+ - else
+ commented on a
- if discussion&.diff_discussion?
- - if discussion.new_discussion?
- started a new discussion
- - else
- commented on a discussion
-
- on #{link_to discussion.file_path, target_url}
+ discussion on #{link_to(discussion.file_path, target_url)}
- else
- - if discussion.new_discussion?
- started a new discussion
- - else
- commented on a #{link_to 'discussion', target_url}
-
-- elsif Gitlab::CurrentSettings.email_author_in_body
- %p.details
- #{link_to note.author_name, user_url(note.author)} commented:
+ = link_to 'discussion', target_url
- if discussion&.diff_discussion? && discussion.on_text?
= content_for :head do
diff --git a/app/views/notify/_note_email.text.erb b/app/views/notify/_note_email.text.erb
index fae8fa3ccf3..a25daad8458 100644
--- a/app/views/notify/_note_email.text.erb
+++ b/app/views/notify/_note_email.text.erb
@@ -1,29 +1,25 @@
<% note = local_assigns.fetch(:note, @note) -%>
<% diff_limit = local_assigns.fetch(:diff_limit, nil) -%>
<% target_url = local_assigns.fetch(:target_url, @target_url) -%>
+<% discussion = note.discussion if note.part_of_discussion? -%>
-<% discussion = note.discussion if note.part_of_discussion? -%>
-<% if discussion && !discussion.individual_note? -%>
-<%= sanitize_name(note.author_name) -%>
+<%= sanitize_name(note.author_name) -%>
+<% if discussion.nil? -%>
+ <%= 'commented' -%>:
+<% else -%>
<% if discussion.new_discussion? -%>
-<%= " started a new discussion" -%>
+ <%= 'started a new discussion' -%>
<% else -%>
-<%= " commented on a discussion" -%>
+ <%= 'commented on a discussion' -%>
<% end -%>
<% if discussion.diff_discussion? -%>
-<%= " on #{discussion.file_path}" -%>
+ <%= "on #{discussion.file_path}" -%>
<% end -%>
-<%= ":" -%>
-<% if discussion.diff_discussion? || !discussion.new_discussion? -%>
-<%= " #{target_url}" -%>
-<% end -%>
-
-
-<% elsif Gitlab::CurrentSettings.email_author_in_body -%>
-<%= "#{sanitize_name(note.author_name)} commented:" -%>
+<%= ':' -%>
+<%= " #{target_url}" -%>
+<% end -%>
-<% end -%>
<% if discussion&.diff_discussion? && discussion.on_text? -%>
<% discussion.truncated_diff_lines(highlight: false, diff_limit: diff_limit).each do |line| -%>
<%= "> #{line.text}\n" -%>
diff --git a/app/views/notify/new_issue_email.html.haml b/app/views/notify/new_issue_email.html.haml
index 8aa7939dd0b..78afb42c9cf 100644
--- a/app/views/notify/new_issue_email.html.haml
+++ b/app/views/notify/new_issue_email.html.haml
@@ -1,6 +1,5 @@
-- if Gitlab::CurrentSettings.email_author_in_body
- %p.details
- #{link_to @issue.author_name, user_url(@issue.author)} created an issue:
+%p.details
+ #{link_to @issue.author_name, user_url(@issue.author)} created an issue:
- if @issue.assignees.any?
%p
diff --git a/app/views/notify/new_issue_email.text.erb b/app/views/notify/new_issue_email.text.erb
index ff258711b48..b93d95ef02f 100644
--- a/app/views/notify/new_issue_email.text.erb
+++ b/app/views/notify/new_issue_email.text.erb
@@ -1,7 +1,9 @@
-New Issue was created.
+<%= sanitize_name(@issue.author_name) %> <%= 'created an issue:' %>
-Issue <%= @issue.iid %>: <%= url_for(project_issue_url(@issue.project, @issue)) %>
-Author: <%= sanitize_name(@issue.author_name) %>
-<%= assignees_label(@issue) %>
+<% if @issue.assignees.any? -%>
+ <%= assignees_label(@issue) %>
+<% end %>
-<%= @issue.description %>
+<% if @issue.description -%>
+ <%= @issue.description %>
+<% end %>
diff --git a/app/views/notify/new_merge_request_email.html.haml b/app/views/notify/new_merge_request_email.html.haml
index 9ab648e2a64..2ddea0b9f16 100644
--- a/app/views/notify/new_merge_request_email.html.haml
+++ b/app/views/notify/new_merge_request_email.html.haml
@@ -1,15 +1,15 @@
-- if Gitlab::CurrentSettings.email_author_in_body
- %p.details
- #{link_to @merge_request.author_name, user_url(@merge_request.author)} created a merge request:
-
%p.details
- = merge_path_description(@merge_request, '→')
+ #{link_to @merge_request.author_name, user_url(@merge_request.author)} created a merge request:
-- if @merge_request.assignees.any?
- %p
+%p
+ .branch
+ = merge_path_description(@merge_request, 'to')
+ .author
+ Author #{@merge_request.author_name}
+ .assignee
= assignees_label(@merge_request)
-
-= render_if_exists 'notify/merge_request_approvers', presenter: @mr_presenter
+ .approvers
+ = render_if_exists 'notify/merge_request_approvers', presenter: @mr_presenter
- if @merge_request.description
%div
diff --git a/app/views/notify/new_merge_request_email.text.erb b/app/views/notify/new_merge_request_email.text.erb
index e6c42f1cf5f..c3f2902c78a 100644
--- a/app/views/notify/new_merge_request_email.text.erb
+++ b/app/views/notify/new_merge_request_email.text.erb
@@ -1,9 +1,7 @@
-New Merge Request <%= @merge_request.to_reference %>
-
-<%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request)) %>
+<%= @merge_request.author_name %> <%= 'created a merge request:' %> <%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request)) %>
<%= merge_path_description(@merge_request, 'to') %>
-Author: <%= @merge_request.author_name %>
+<%= 'Author' %>: <%= @merge_request.author_name %>
<%= assignees_label(@merge_request) %>
<%= render_if_exists 'notify/merge_request_approvers', presenter: @mr_presenter %>
diff --git a/app/views/projects/environments/index.html.haml b/app/views/projects/environments/index.html.haml
index 99cbbc11acd..3ec92676cde 100644
--- a/app/views/projects/environments/index.html.haml
+++ b/app/views/projects/environments/index.html.haml
@@ -6,4 +6,5 @@
"can-create-environment" => can?(current_user, :create_environment, @project).to_s,
"new-environment-path" => new_project_environment_path(@project),
"help-page-path" => help_page_path("ci/environments"),
+ "deploy-boards-help-path" => help_page_path("user/project/deploy_boards", anchor: "enabling-deploy-boards"),
"css-class" => container_class } }
diff --git a/app/workers/cluster_provision_worker.rb b/app/workers/cluster_provision_worker.rb
index 926ae2b7286..59de7903c1c 100644
--- a/app/workers/cluster_provision_worker.rb
+++ b/app/workers/cluster_provision_worker.rb
@@ -9,8 +9,6 @@ class ClusterProvisionWorker
cluster.provider.try do |provider|
Clusters::Gcp::ProvisionService.new.execute(provider) if cluster.gcp?
end
-
- ClusterConfigureWorker.perform_async(cluster.id) if cluster.user?
end
end
end
diff --git a/changelogs/unreleased/10088-move-code-differences-EE-to-CE.yml b/changelogs/unreleased/10088-move-code-differences-EE-to-CE.yml
deleted file mode 100644
index 1297e9712fa..00000000000
--- a/changelogs/unreleased/10088-move-code-differences-EE-to-CE.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Added code differnces from EE in file 'app/assets/javascripts/pages/projects/project.js' to CE"
-merge_request: 29271
-author: Michel Engelen
-type: other
diff --git a/changelogs/unreleased/10795-add-epic-tree-BE-CE-epic-graphql-support.yml b/changelogs/unreleased/10795-add-epic-tree-BE-CE-epic-graphql-support.yml
deleted file mode 100644
index 4c85d4f9acb..00000000000
--- a/changelogs/unreleased/10795-add-epic-tree-BE-CE-epic-graphql-support.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Added reference, web_path, and relative_position fields to GraphQL Issue
-merge_request: 28998
-author:
-type: changed
diff --git a/changelogs/unreleased/10798-remove-dind-req-for-dast.yml b/changelogs/unreleased/10798-remove-dind-req-for-dast.yml
deleted file mode 100644
index 33545fc7cfd..00000000000
--- a/changelogs/unreleased/10798-remove-dind-req-for-dast.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove dind from DAST template
-merge_request: 28083
-author:
-type: changed
diff --git a/changelogs/unreleased/10842-add-missing-environments-variable-to-the-sast-analyzer-docker-container.yml b/changelogs/unreleased/10842-add-missing-environments-variable-to-the-sast-analyzer-docker-container.yml
deleted file mode 100644
index 112b472aa3b..00000000000
--- a/changelogs/unreleased/10842-add-missing-environments-variable-to-the-sast-analyzer-docker-container.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'Fix: propagate all documented ENV vars to CI when using SAST'
-merge_request: 29564
-author:
-type: fixed
diff --git a/changelogs/unreleased/11105-fix-cs-with-proxy.yml b/changelogs/unreleased/11105-fix-cs-with-proxy.yml
deleted file mode 100644
index ee32427d20e..00000000000
--- a/changelogs/unreleased/11105-fix-cs-with-proxy.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix proxy support in Container Scanning
-merge_request: 27246
-author:
-type: fixed
diff --git a/changelogs/unreleased/11204-turn-off-mask-by-default.yml b/changelogs/unreleased/11204-turn-off-mask-by-default.yml
deleted file mode 100644
index 5c554e04d45..00000000000
--- a/changelogs/unreleased/11204-turn-off-mask-by-default.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Default masked to false for new variables
-merge_request: 28186
-author:
-type: changed
diff --git a/changelogs/unreleased/11609-geo-remove-support-for-using-geo-with-an-installation-from-source-docs.yml b/changelogs/unreleased/11609-geo-remove-support-for-using-geo-with-an-installation-from-source-docs.yml
deleted file mode 100644
index 6570cb3e2a3..00000000000
--- a/changelogs/unreleased/11609-geo-remove-support-for-using-geo-with-an-installation-from-source-docs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove support for using Geo with an installation from source
-merge_request: 28737
-author:
-type: other
diff --git a/changelogs/unreleased/12106-sp-ce.yml b/changelogs/unreleased/12106-sp-ce.yml
deleted file mode 100644
index 2d073401b45..00000000000
--- a/changelogs/unreleased/12106-sp-ce.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Moves snowplow to CE repo
-merge_request:
-author:
-type: other
diff --git a/changelogs/unreleased/1340-request-job-with-age.yml b/changelogs/unreleased/1340-request-job-with-age.yml
deleted file mode 100644
index 766ac008c2e..00000000000
--- a/changelogs/unreleased/1340-request-job-with-age.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Added option to filter jobs by age in the /job/request API endpoint."
-merge_request: 1340
-author: Dmitry Chepurovskiy
-type: added
diff --git a/changelogs/unreleased/13453_minimal_atom_fix.yml b/changelogs/unreleased/13453_minimal_atom_fix.yml
deleted file mode 100644
index e0c18de3b1f..00000000000
--- a/changelogs/unreleased/13453_minimal_atom_fix.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Added a content field to atom feed
-merge_request: 27652
-author:
-type: fixed
diff --git a/changelogs/unreleased/19569-include-information-if-issue-was-closed-via-mr.yml b/changelogs/unreleased/19569-include-information-if-issue-was-closed-via-mr.yml
deleted file mode 100644
index bb2fc9af2a1..00000000000
--- a/changelogs/unreleased/19569-include-information-if-issue-was-closed-via-mr.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Include information if issue was clossed via merge request or commit
-merge_request: 15610
-author: Michał Zając
-type: changed
diff --git a/changelogs/unreleased/237-style-toast-component.yml b/changelogs/unreleased/237-style-toast-component.yml
deleted file mode 100644
index 2420df0ee55..00000000000
--- a/changelogs/unreleased/237-style-toast-component.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Style the toast component according to design specs.
-merge_request: 27734
-author:
-type: added
diff --git a/changelogs/unreleased/27987-use-findorcreateservice-to-create-labels.yml b/changelogs/unreleased/27987-use-findorcreateservice-to-create-labels.yml
deleted file mode 100644
index 8d3501e0171..00000000000
--- a/changelogs/unreleased/27987-use-findorcreateservice-to-create-labels.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use FindOrCreateService to create labels and check for existing ones
-merge_request: 27987
-author: Matt Duren
-type: fixed
diff --git a/changelogs/unreleased/28757-remove-docker-pull-prefix-when-copying-a-tag-from-the-registry.yml b/changelogs/unreleased/28757-remove-docker-pull-prefix-when-copying-a-tag-from-the-registry.yml
deleted file mode 100644
index e954b97f05b..00000000000
--- a/changelogs/unreleased/28757-remove-docker-pull-prefix-when-copying-a-tag-from-the-registry.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove `docker pull` prefix when copying a tag from the registry
-merge_request: 28757
-author: Benedikt Franke
-type: changed
diff --git a/changelogs/unreleased/28996-create-mvc-ui-in-haml.yml b/changelogs/unreleased/28996-create-mvc-ui-in-haml.yml
deleted file mode 100644
index 9c6897babb4..00000000000
--- a/changelogs/unreleased/28996-create-mvc-ui-in-haml.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add auto SSL toggle option to Pages domain settings page
-merge_request: 26438
-author:
-type: added
diff --git a/changelogs/unreleased/30138-display-cycle-analytics-issue-logic-fixes.yml b/changelogs/unreleased/30138-display-cycle-analytics-issue-logic-fixes.yml
deleted file mode 100644
index 574995f20fa..00000000000
--- a/changelogs/unreleased/30138-display-cycle-analytics-issue-logic-fixes.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Change logic behind cycle analytics
-merge_request: 29018
-author:
-type: changed
diff --git a/changelogs/unreleased/30138-display-cycle-analytics-issue.yml b/changelogs/unreleased/30138-display-cycle-analytics-issue.yml
deleted file mode 100644
index c7faa0480bd..00000000000
--- a/changelogs/unreleased/30138-display-cycle-analytics-issue.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Show data on Cycle Analytics page when value is less than a second
-merge_request: 28507
-author:
-type: fixed
diff --git a/changelogs/unreleased/33064-add-labels-to-note-event-payload.yml b/changelogs/unreleased/33064-add-labels-to-note-event-payload.yml
deleted file mode 100644
index e0a6253e1ef..00000000000
--- a/changelogs/unreleased/33064-add-labels-to-note-event-payload.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add labels to note event payload
-merge_request: 29384
-author: Sujay Patel
-type: added
diff --git a/changelogs/unreleased/35428-docker-registry-date-not-accurate.yml b/changelogs/unreleased/35428-docker-registry-date-not-accurate.yml
deleted file mode 100644
index f51ecdf83a6..00000000000
--- a/changelogs/unreleased/35428-docker-registry-date-not-accurate.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Changed the 'Created' label to 'Last Updated' on the container registry table
- to more accurately reflect what the date represents.
-merge_request: 29464
-author:
-type: other
diff --git a/changelogs/unreleased/37495.yml b/changelogs/unreleased/37495.yml
deleted file mode 100644
index f6d421fc45b..00000000000
--- a/changelogs/unreleased/37495.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add documentation links for confidental and locked discussions
-merge_request: 29073
-author:
-type: changed
diff --git a/changelogs/unreleased/38561-border-radii.yml b/changelogs/unreleased/38561-border-radii.yml
deleted file mode 100644
index 510af18d651..00000000000
--- a/changelogs/unreleased/38561-border-radii.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix border radii on diff files and repo files
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/39304-broadcast-message-buttons.yml b/changelogs/unreleased/39304-broadcast-message-buttons.yml
deleted file mode 100644
index 7eb289fca1f..00000000000
--- a/changelogs/unreleased/39304-broadcast-message-buttons.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update broadcast message action icons
-merge_request: 28496
-author: Jarek Ostrowski @jareko
-type: fixed
diff --git a/changelogs/unreleased/42399-registry-confirm-deletion.yml b/changelogs/unreleased/42399-registry-confirm-deletion.yml
new file mode 100644
index 00000000000..4d720e16721
--- /dev/null
+++ b/changelogs/unreleased/42399-registry-confirm-deletion.yml
@@ -0,0 +1,5 @@
+---
+title: Add confirmation for registry image deletion
+merge_request: 29505
+author:
+type: added
diff --git a/changelogs/unreleased/45687-web-ide-empty-state.yml b/changelogs/unreleased/45687-web-ide-empty-state.yml
deleted file mode 100644
index 9ef148275ab..00000000000
--- a/changelogs/unreleased/45687-web-ide-empty-state.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Empty project state for Web IDE
-merge_request: 26556
-author:
-type: added
diff --git a/changelogs/unreleased/47846-position-is-off-when-visiting-files-with-anchors.yml b/changelogs/unreleased/47846-position-is-off-when-visiting-files-with-anchors.yml
deleted file mode 100644
index 21dc170f1ca..00000000000
--- a/changelogs/unreleased/47846-position-is-off-when-visiting-files-with-anchors.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Resolve Position is off when visiting files with anchors
-merge_request: 28913
-author:
-type: fixed
diff --git a/changelogs/unreleased/49041-issue-board-input-height.yml b/changelogs/unreleased/49041-issue-board-input-height.yml
deleted file mode 100644
index de3fbb2ee11..00000000000
--- a/changelogs/unreleased/49041-issue-board-input-height.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Reduce height of issue board input to align with buttons
-merge_request:
-author:
-type: other
diff --git a/changelogs/unreleased/49517-fix-notes-import-export.yml b/changelogs/unreleased/49517-fix-notes-import-export.yml
deleted file mode 100644
index a9f4d736e0b..00000000000
--- a/changelogs/unreleased/49517-fix-notes-import-export.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix diff notes and discussion notes being exported as regular notes
-merge_request: 28401
-author:
-type: fixed
diff --git a/changelogs/unreleased/49814-display-in-admin-area-if-emails-are-verified-or-not.yml b/changelogs/unreleased/49814-display-in-admin-area-if-emails-are-verified-or-not.yml
new file mode 100644
index 00000000000..db1391edd73
--- /dev/null
+++ b/changelogs/unreleased/49814-display-in-admin-area-if-emails-are-verified-or-not.yml
@@ -0,0 +1,5 @@
+---
+title: Add a verified pill next to email addresses under the admin users section.
+merge_request: 29669
+author:
+type: added
diff --git a/changelogs/unreleased/49915-fix-error-500-admin-projects-nil-storage.yml b/changelogs/unreleased/49915-fix-error-500-admin-projects-nil-storage.yml
deleted file mode 100644
index 307c2bfb49d..00000000000
--- a/changelogs/unreleased/49915-fix-error-500-admin-projects-nil-storage.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix an error in projects admin when statistics are missing
-merge_request: 28355
-author:
-type: fixed
diff --git a/changelogs/unreleased/50106-hide-whitespace-changes.yml b/changelogs/unreleased/50106-hide-whitespace-changes.yml
deleted file mode 100644
index e95953c8665..00000000000
--- a/changelogs/unreleased/50106-hide-whitespace-changes.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix whitespace changes visibility when the related file was initially collapsed
-merge_request: 28950
-author: Ondřej Budai
-type: fixed
diff --git a/changelogs/unreleased/50850-kerrizor-extend-api-to-accept-start_project-option.yml b/changelogs/unreleased/50850-kerrizor-extend-api-to-accept-start_project-option.yml
deleted file mode 100644
index 45770e1012c..00000000000
--- a/changelogs/unreleased/50850-kerrizor-extend-api-to-accept-start_project-option.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add API support for committing changes to different projects in same fork network
-merge_request: 27915
-author:
-type: added
diff --git a/changelogs/unreleased/51022-added-extended-height-to-labels-dropdown.yml b/changelogs/unreleased/51022-added-extended-height-to-labels-dropdown.yml
deleted file mode 100644
index 07bf8b04bbe..00000000000
--- a/changelogs/unreleased/51022-added-extended-height-to-labels-dropdown.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Added the `.extended-height` class to the labels-dropdown"
-merge_request: 28659
-author: Michel Engelen
-type: other
diff --git a/changelogs/unreleased/51636-task-list-api-pderichs.yml b/changelogs/unreleased/51636-task-list-api-pderichs.yml
deleted file mode 100644
index f18a0936ab2..00000000000
--- a/changelogs/unreleased/51636-task-list-api-pderichs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add task count and completed count to responses of Issue and MR
-merge_request: 28859
-author:
-type: added
diff --git a/changelogs/unreleased/51854-api-to-get-all-project-group-members-returns-duplicates.yml b/changelogs/unreleased/51854-api-to-get-all-project-group-members-returns-duplicates.yml
deleted file mode 100644
index 4e16b95ec11..00000000000
--- a/changelogs/unreleased/51854-api-to-get-all-project-group-members-returns-duplicates.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Removes duplicated members from api/projects/:id/members/all
-merge_request: 24005
-author: Jacopo Beschi @jacopo-beschi
-type: changed
diff --git a/changelogs/unreleased/53134-multiple-extendes-for-a-job.yml b/changelogs/unreleased/53134-multiple-extendes-for-a-job.yml
deleted file mode 100644
index e09de8ac8fc..00000000000
--- a/changelogs/unreleased/53134-multiple-extendes-for-a-job.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add support for multiple job parents in GitLab CI YAML.
-merge_request: 26801
-author: Wolphin (Nikita)
-type: added
diff --git a/changelogs/unreleased/54140-non-ar-cache-commit-markdown.yml b/changelogs/unreleased/54140-non-ar-cache-commit-markdown.yml
deleted file mode 100644
index efda07380a4..00000000000
--- a/changelogs/unreleased/54140-non-ar-cache-commit-markdown.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use Redis for CacheMarkDownField on non AR models
-merge_request: 29054
-author:
-type: performance
diff --git a/changelogs/unreleased/54169-flash-warning-rebrush.yml b/changelogs/unreleased/54169-flash-warning-rebrush.yml
deleted file mode 100644
index 420cc26a8cc..00000000000
--- a/changelogs/unreleased/54169-flash-warning-rebrush.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Rebrush of flash-warning according to the new design (brighter background and darker font)"
-merge_request: 28916
-author: Michel Engelen
-type: changed
diff --git a/changelogs/unreleased/55033-discussion-system-note-alignment.yml b/changelogs/unreleased/55033-discussion-system-note-alignment.yml
deleted file mode 100644
index 27072ec7e12..00000000000
--- a/changelogs/unreleased/55033-discussion-system-note-alignment.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Align system note within discussion with other notes
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/55125-mr-tab-scrolling.yml b/changelogs/unreleased/55125-mr-tab-scrolling.yml
deleted file mode 100644
index e03ff6c5060..00000000000
--- a/changelogs/unreleased/55125-mr-tab-scrolling.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update merge request tabs so they no longer scroll
-merge_request:
-author:
-type: other
diff --git a/changelogs/unreleased/55253-activity-feed-ui-enhance-line-height.yml b/changelogs/unreleased/55253-activity-feed-ui-enhance-line-height.yml
deleted file mode 100644
index f7dd8c59a7c..00000000000
--- a/changelogs/unreleased/55253-activity-feed-ui-enhance-line-height.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Enhance line-height of Activity feed UI
-merge_request: 28856
-author: Jacopo Beschi @jacopo-beschi
-type: changed
diff --git a/changelogs/unreleased/55362-refresh-blank-service-account-token.yml b/changelogs/unreleased/55362-refresh-blank-service-account-token.yml
deleted file mode 100644
index 3189de97e8b..00000000000
--- a/changelogs/unreleased/55362-refresh-blank-service-account-token.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Refresh service_account_token for kubernetes_namespaces
-merge_request: 29657
-author:
-type: fixed
diff --git a/changelogs/unreleased/55447-validate-k8s-credentials.yml b/changelogs/unreleased/55447-validate-k8s-credentials.yml
deleted file mode 100644
index 81f0efdb325..00000000000
--- a/changelogs/unreleased/55447-validate-k8s-credentials.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Validate Kubernetes credentials at cluster creation
-merge_request: 27403
-author:
-type: added
diff --git a/changelogs/unreleased/5615-non-admins-only-archieve-ce.yml b/changelogs/unreleased/5615-non-admins-only-archieve-ce.yml
deleted file mode 100644
index ac1aa249b82..00000000000
--- a/changelogs/unreleased/5615-non-admins-only-archieve-ce.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add deletion protection setting column to application_settings table
-merge_request: 29268
-author:
-type: other
diff --git a/changelogs/unreleased/56737-commits-and-mr-events-on-jira-api.yml b/changelogs/unreleased/56737-commits-and-mr-events-on-jira-api.yml
deleted file mode 100644
index ee2ce8acaeb..00000000000
--- a/changelogs/unreleased/56737-commits-and-mr-events-on-jira-api.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Expose all current events properly on services API
-merge_request: 29736
-author: Zsolt Kovari
-type: fixed
diff --git a/changelogs/unreleased/56959-drop-project_auto_devops_domain.yml b/changelogs/unreleased/56959-drop-project_auto_devops_domain.yml
deleted file mode 100644
index c529749670d..00000000000
--- a/changelogs/unreleased/56959-drop-project_auto_devops_domain.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Removes project_auto_devops#domain column
-merge_request: 28574
-author:
-type: other
diff --git a/changelogs/unreleased/56959-remove-auto-devops-domain-ci-variable.yml b/changelogs/unreleased/56959-remove-auto-devops-domain-ci-variable.yml
deleted file mode 100644
index c1c1708f935..00000000000
--- a/changelogs/unreleased/56959-remove-auto-devops-domain-ci-variable.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Removes support for AUTO_DEVOPS_DOMAIN
-merge_request: 28460
-author:
-type: removed
diff --git a/changelogs/unreleased/57037-fix-mr-checkboxes-mobile-alignment.yml b/changelogs/unreleased/57037-fix-mr-checkboxes-mobile-alignment.yml
deleted file mode 100644
index a2de6cd6d45..00000000000
--- a/changelogs/unreleased/57037-fix-mr-checkboxes-mobile-alignment.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix Merge Request merge checkbox alignment on mobile view
-merge_request: 28845
-author:
-type: fixed
diff --git a/changelogs/unreleased/57189-css-label-in-forms-with-bootstrap4.yml b/changelogs/unreleased/57189-css-label-in-forms-with-bootstrap4.yml
deleted file mode 100644
index 86b6bb20253..00000000000
--- a/changelogs/unreleased/57189-css-label-in-forms-with-bootstrap4.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix col-sm-* in forms to keep layout
-merge_request: 24885
-author: Takuya Noguchi
-type: fixed
diff --git a/changelogs/unreleased/57813-merge-request-tabs-do-not-handle-ctrl-click-correctly.yml b/changelogs/unreleased/57813-merge-request-tabs-do-not-handle-ctrl-click-correctly.yml
deleted file mode 100644
index 272faa67fcf..00000000000
--- a/changelogs/unreleased/57813-merge-request-tabs-do-not-handle-ctrl-click-correctly.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Allow command/control click to open link in new tab on Merge Request tabs
-merge_request: 29506
-author:
-type: fixed
diff --git a/changelogs/unreleased/57825-moving-an-issue-results-in-broken-image-links-in-comments.yml b/changelogs/unreleased/57825-moving-an-issue-results-in-broken-image-links-in-comments.yml
deleted file mode 100644
index faa1784ea21..00000000000
--- a/changelogs/unreleased/57825-moving-an-issue-results-in-broken-image-links-in-comments.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Resolve moving an issue results in broken image links in comments
-merge_request: 28654
-author:
-type: fixed
diff --git a/changelogs/unreleased/58065-uniform-html-txt-email.yml b/changelogs/unreleased/58065-uniform-html-txt-email.yml
new file mode 100644
index 00000000000..be34e93ff83
--- /dev/null
+++ b/changelogs/unreleased/58065-uniform-html-txt-email.yml
@@ -0,0 +1,5 @@
+---
+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
diff --git a/changelogs/unreleased/58269-separate-update-patch.yml b/changelogs/unreleased/58269-separate-update-patch.yml
deleted file mode 100644
index e9b44257b07..00000000000
--- a/changelogs/unreleased/58269-separate-update-patch.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Do not display Update app button when saving Knative domain name
-merge_request: 28904
-author:
-type: changed
diff --git a/changelogs/unreleased/58297-remove-extraneous-gitaly-calls-from-md-rendering.yml b/changelogs/unreleased/58297-remove-extraneous-gitaly-calls-from-md-rendering.yml
deleted file mode 100644
index 25cc973159f..00000000000
--- a/changelogs/unreleased/58297-remove-extraneous-gitaly-calls-from-md-rendering.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Reduce Gitaly calls to improve performance when rendering suggestions
-merge_request: 29027
-author:
-type: performance
diff --git a/changelogs/unreleased/58404-set-default-max-depth-for-GraphQL.yml b/changelogs/unreleased/58404-set-default-max-depth-for-GraphQL.yml
deleted file mode 100644
index 7e95158a0e0..00000000000
--- a/changelogs/unreleased/58404-set-default-max-depth-for-GraphQL.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 58404 - setup max depth for GraphQL
-merge_request: 25737
-author: Ken Ding
-type: added
diff --git a/changelogs/unreleased/58433-email-notifications-do-not-work-properly-issue-due-date.yml b/changelogs/unreleased/58433-email-notifications-do-not-work-properly-issue-due-date.yml
deleted file mode 100644
index 4579721446a..00000000000
--- a/changelogs/unreleased/58433-email-notifications-do-not-work-properly-issue-due-date.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix email notifications for user excluded actions
-merge_request: 28835
-author:
-type: fixed
diff --git a/changelogs/unreleased/58538-discussion-top-radius.yml b/changelogs/unreleased/58538-discussion-top-radius.yml
deleted file mode 100644
index 0fb16055623..00000000000
--- a/changelogs/unreleased/58538-discussion-top-radius.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix border radius of discussions
-merge_request: 28490
-author:
-type: fixed
diff --git a/changelogs/unreleased/58632-fix-mr-widget-padding.yml b/changelogs/unreleased/58632-fix-mr-widget-padding.yml
deleted file mode 100644
index fb4e1791359..00000000000
--- a/changelogs/unreleased/58632-fix-mr-widget-padding.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix padding in MR widget
-merge_request: 28472
-author:
-type: fixed
diff --git a/changelogs/unreleased/58941-use-gitlab-serverless-with-existing-knative-installation.yml b/changelogs/unreleased/58941-use-gitlab-serverless-with-existing-knative-installation.yml
deleted file mode 100644
index 53be008816d..00000000000
--- a/changelogs/unreleased/58941-use-gitlab-serverless-with-existing-knative-installation.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Enable function features for external Knative installations
-merge_request: 27173
-author:
-type: changed
diff --git a/changelogs/unreleased/58984-doc-missing-milestones-and-labels-links.yml b/changelogs/unreleased/58984-doc-missing-milestones-and-labels-links.yml
deleted file mode 100644
index 6b74303c16e..00000000000
--- a/changelogs/unreleased/58984-doc-missing-milestones-and-labels-links.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Document when milestones and labels links are missing
-merge_request: 29355
-author:
-type: other
diff --git a/changelogs/unreleased/59023-fix-web-ide-creating-branches-off-new-commits.yml b/changelogs/unreleased/59023-fix-web-ide-creating-branches-off-new-commits.yml
deleted file mode 100644
index f7e0ee333aa..00000000000
--- a/changelogs/unreleased/59023-fix-web-ide-creating-branches-off-new-commits.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix IDE commit using latest ref in branch and overriding contents
-merge_request: 29769
-author:
-type: fixed
diff --git a/changelogs/unreleased/59026-replace-favicon.yml b/changelogs/unreleased/59026-replace-favicon.yml
deleted file mode 100644
index 34228bb8438..00000000000
--- a/changelogs/unreleased/59026-replace-favicon.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update favicon from next
-merge_request: 28601
-author: Jarek Ostrowski @jareko
-type: fixed
diff --git a/changelogs/unreleased/59105-padding-unclickable-pipeline-job.yml b/changelogs/unreleased/59105-padding-unclickable-pipeline-job.yml
deleted file mode 100644
index 95f08af3cb1..00000000000
--- a/changelogs/unreleased/59105-padding-unclickable-pipeline-job.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix padding of unclickable pipeline dropdown items to match links
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/59376-Report-abuse-to-GitLab-should-be-Report-abuse-in-non-gitlab-com-instances.yml b/changelogs/unreleased/59376-Report-abuse-to-GitLab-should-be-Report-abuse-in-non-gitlab-com-instances.yml
deleted file mode 100644
index 0904f788b6f..00000000000
--- a/changelogs/unreleased/59376-Report-abuse-to-GitLab-should-be-Report-abuse-in-non-gitlab-com-instances.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Change "Report abuse to GitLab" to more generic wording
-merge_request: 28884
-author: Marc Schwede
-type: other
diff --git a/changelogs/unreleased/59587-add-graphql-logging.yml b/changelogs/unreleased/59587-add-graphql-logging.yml
deleted file mode 100644
index 74c2a734f37..00000000000
--- a/changelogs/unreleased/59587-add-graphql-logging.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add dedicated logging for GraphQL queries
-merge_request: 27885
-author:
-type: other
diff --git a/changelogs/unreleased/59651-remove-unnecessary-decimal-places-on-chart-axes.yml b/changelogs/unreleased/59651-remove-unnecessary-decimal-places-on-chart-axes.yml
deleted file mode 100644
index fea34099135..00000000000
--- a/changelogs/unreleased/59651-remove-unnecessary-decimal-places-on-chart-axes.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove unnecessary decimals on Metrics chart axis
-merge_request: 29468
-author:
-type: fixed
diff --git a/changelogs/unreleased/59987-move-sign-in-2fa-on-users-sign_in-above-intro-content-on-mobile.yml b/changelogs/unreleased/59987-move-sign-in-2fa-on-users-sign_in-above-intro-content-on-mobile.yml
deleted file mode 100644
index 7863f1f7bbe..00000000000
--- a/changelogs/unreleased/59987-move-sign-in-2fa-on-users-sign_in-above-intro-content-on-mobile.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Prioritize login form on mobile breakpoint
-merge_request: 28360
-author:
-type: changed
diff --git a/changelogs/unreleased/60034-default-web-ide-s-merge-request-checkbox-to-true.yml b/changelogs/unreleased/60034-default-web-ide-s-merge-request-checkbox-to-true.yml
deleted file mode 100644
index fdf80c660f7..00000000000
--- a/changelogs/unreleased/60034-default-web-ide-s-merge-request-checkbox-to-true.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Default MR checkbox to true in most cases
-merge_request: !28665
-author:
-type: changed
diff --git a/changelogs/unreleased/60180-jira-service-fix-nil-on-find-call.yml b/changelogs/unreleased/60180-jira-service-fix-nil-on-find-call.yml
deleted file mode 100644
index 6891a9ca83c..00000000000
--- a/changelogs/unreleased/60180-jira-service-fix-nil-on-find-call.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'Resolved JIRA service: NoMethodError: undefined method ''find'' for nil:NilClass'
-merge_request: 28206
-author:
-type: fixed
diff --git a/changelogs/unreleased/60250-remove-mr_push_options-flag.yml b/changelogs/unreleased/60250-remove-mr_push_options-flag.yml
deleted file mode 100644
index b429d83dcc7..00000000000
--- a/changelogs/unreleased/60250-remove-mr_push_options-flag.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove the mr_push_options feature flag
-merge_request: 28278
-author:
-type: changed
diff --git a/changelogs/unreleased/60303-replace-sidekiq-mtail-metrics.yml b/changelogs/unreleased/60303-replace-sidekiq-mtail-metrics.yml
deleted file mode 100644
index 90b72ec05c7..00000000000
--- a/changelogs/unreleased/60303-replace-sidekiq-mtail-metrics.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Replaces sidekiq mtail metrics with ruby instrumentation metrics
-merge_request: 29215
-author:
-type: changed
diff --git a/changelogs/unreleased/60323-inline-validation-for-users-name-and-username-length.yml b/changelogs/unreleased/60323-inline-validation-for-users-name-and-username-length.yml
deleted file mode 100644
index 83b7bd3433e..00000000000
--- a/changelogs/unreleased/60323-inline-validation-for-users-name-and-username-length.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update registration form to indicate invalid name or username length on input
-merge_request: 28095
-author: Jiaan Louw
-type: changed
diff --git a/changelogs/unreleased/60379-remove-ci-preparing-state-feature-flag.yml b/changelogs/unreleased/60379-remove-ci-preparing-state-feature-flag.yml
deleted file mode 100644
index a9b7aeb3024..00000000000
--- a/changelogs/unreleased/60379-remove-ci-preparing-state-feature-flag.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove ability for group clusters to be automatically configured on creation
-merge_request: 27245
-author:
-type: removed
diff --git a/changelogs/unreleased/60425-fix-500-when-accessing-charts-with-anonymous-user.yml b/changelogs/unreleased/60425-fix-500-when-accessing-charts-with-anonymous-user.yml
deleted file mode 100644
index 4274dc5918c..00000000000
--- a/changelogs/unreleased/60425-fix-500-when-accessing-charts-with-anonymous-user.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Fix 500 error when accessing charts with an anonymous user"
-merge_request: 28091
-author: Diego Silva
-type: fixed
diff --git a/changelogs/unreleased/60617-allow-switching-from-gitlab-managed-to-unmanaged-clusters.yml b/changelogs/unreleased/60617-allow-switching-from-gitlab-managed-to-unmanaged-clusters.yml
deleted file mode 100644
index 1127dde4fcf..00000000000
--- a/changelogs/unreleased/60617-allow-switching-from-gitlab-managed-to-unmanaged-clusters.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Allow switching clusters between managed and unmanaged
-merge_request: 29322
-author:
-type: added
diff --git a/changelogs/unreleased/60617-enable-project-cluster-jit.yml b/changelogs/unreleased/60617-enable-project-cluster-jit.yml
new file mode 100644
index 00000000000..b7d745d4385
--- /dev/null
+++ b/changelogs/unreleased/60617-enable-project-cluster-jit.yml
@@ -0,0 +1,5 @@
+---
+title: Enable just-in-time Kubernetes resource creation for project-level clusters
+merge_request: 29515
+author:
+type: changed
diff --git a/changelogs/unreleased/60750-milestone-header.yml b/changelogs/unreleased/60750-milestone-header.yml
deleted file mode 100644
index 62cfdaf6ea7..00000000000
--- a/changelogs/unreleased/60750-milestone-header.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix layout of group milestone header
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/60818_yamllint_project_root.yml b/changelogs/unreleased/60818_yamllint_project_root.yml
deleted file mode 100644
index b34a50e6a9c..00000000000
--- a/changelogs/unreleased/60818_yamllint_project_root.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix yaml linting for project root *.yml files
-merge_request: 27579
-author: Will Hall
-type: fixed
diff --git a/changelogs/unreleased/60819_yamllint_gitlabci.yml b/changelogs/unreleased/60819_yamllint_gitlabci.yml
deleted file mode 100644
index aba3b206f7e..00000000000
--- a/changelogs/unreleased/60819_yamllint_gitlabci.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix yaml linting for GitLab CI inside project (.gitlab/ci) *.yml files and CI template files
-merge_request: 27576
-author: Will Hall
-type: fixed
diff --git a/changelogs/unreleased/609120-ref-link.yml b/changelogs/unreleased/609120-ref-link.yml
deleted file mode 100644
index 97c93b7ff53..00000000000
--- a/changelogs/unreleased/609120-ref-link.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fixes Ref link being displayed as raw HTML in the Pipelines page
-merge_request: 28823
-author:
-type: fixed
diff --git a/changelogs/unreleased/60987-emoji-picker-popup.yml b/changelogs/unreleased/60987-emoji-picker-popup.yml
deleted file mode 100644
index 3bccec8e164..00000000000
--- a/changelogs/unreleased/60987-emoji-picker-popup.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix emoji picker visibility issue
-merge_request: 28984
-author:
-type: fixed
diff --git a/changelogs/unreleased/61024-update-resolved-icon.yml b/changelogs/unreleased/61024-update-resolved-icon.yml
deleted file mode 100644
index 4a4de9eb13a..00000000000
--- a/changelogs/unreleased/61024-update-resolved-icon.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add check circle filled icon for resolved comments
-merge_request: 28663
-author:
-type: changed
diff --git a/changelogs/unreleased/6104-ee-ce-difference.yml b/changelogs/unreleased/6104-ee-ce-difference.yml
deleted file mode 100644
index 59d31daf0eb..00000000000
--- a/changelogs/unreleased/6104-ee-ce-difference.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Unified EE/CS differences in repository/show.html
-merge_request: 13562
-author:
-type: other
diff --git a/changelogs/unreleased/61045-charts-with-many-overlapping-series-display-incorrectly.yml b/changelogs/unreleased/61045-charts-with-many-overlapping-series-display-incorrectly.yml
deleted file mode 100644
index 53cc0a15417..00000000000
--- a/changelogs/unreleased/61045-charts-with-many-overlapping-series-display-incorrectly.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Eliminate color inconsistencies in metric graphs
-merge_request: 29127
-author:
-type: fixed
diff --git a/changelogs/unreleased/61049-links-activity-stream.yml b/changelogs/unreleased/61049-links-activity-stream.yml
deleted file mode 100644
index 3aac84adc31..00000000000
--- a/changelogs/unreleased/61049-links-activity-stream.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use blue for activity stream links; use monospace font for commit sha
-merge_request:
-author:
-type: other
diff --git a/changelogs/unreleased/61072-link-to-user-profile-not-distinguishable-on-latest-commit-widget.yml b/changelogs/unreleased/61072-link-to-user-profile-not-distinguishable-on-latest-commit-widget.yml
deleted file mode 100644
index 5285ac767cc..00000000000
--- a/changelogs/unreleased/61072-link-to-user-profile-not-distinguishable-on-latest-commit-widget.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: User link styling for commits
-merge_request: 29150
-author:
-type: other
diff --git a/changelogs/unreleased/61144-style-secondary-button-type-to-be-aligned-with-pattern-library.yml b/changelogs/unreleased/61144-style-secondary-button-type-to-be-aligned-with-pattern-library.yml
deleted file mode 100644
index ed4cf0507c7..00000000000
--- a/changelogs/unreleased/61144-style-secondary-button-type-to-be-aligned-with-pattern-library.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Bring secondary button styles up to design standard
-merge_request: 27920
-author:
-type: fixed
diff --git a/changelogs/unreleased/61157-reviewer-roulette-shouldn-t-include-the-author-as-a-possibility.yml b/changelogs/unreleased/61157-reviewer-roulette-shouldn-t-include-the-author-as-a-possibility.yml
deleted file mode 100644
index 8d1a38b3db5..00000000000
--- a/changelogs/unreleased/61157-reviewer-roulette-shouldn-t-include-the-author-as-a-possibility.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Excludes MR author from Review roulette
-merge_request: 28886
-author: Jacopo Beschi @jacopo-beschi
-type: fixed
diff --git a/changelogs/unreleased/61313-fix-dropdown-searchbar.yml b/changelogs/unreleased/61313-fix-dropdown-searchbar.yml
deleted file mode 100644
index ba191a89da2..00000000000
--- a/changelogs/unreleased/61313-fix-dropdown-searchbar.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix loading.. dropdown at search field
-merge_request: 28275
-author: Pavel Chausov
-type: fixed
diff --git a/changelogs/unreleased/61323-snippet-copy-icon-button-is-misaligned.yml b/changelogs/unreleased/61323-snippet-copy-icon-button-is-misaligned.yml
deleted file mode 100644
index 94666ac12ec..00000000000
--- a/changelogs/unreleased/61323-snippet-copy-icon-button-is-misaligned.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Resolve Snippet icon button is misaligned
-merge_request: 28522
-author:
-type: other
diff --git a/changelogs/unreleased/61324-non-project-snippet-new-snippet-button-should-be-green-outline.yml b/changelogs/unreleased/61324-non-project-snippet-new-snippet-button-should-be-green-outline.yml
deleted file mode 100644
index a7f5706058d..00000000000
--- a/changelogs/unreleased/61324-non-project-snippet-new-snippet-button-should-be-green-outline.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Give New Snippet button green outline
-merge_request: 28559
-author:
-type: other
diff --git a/changelogs/unreleased/61339-Add-underline-to-attach-a-file.yml b/changelogs/unreleased/61339-Add-underline-to-attach-a-file.yml
deleted file mode 100644
index e446459ffc8..00000000000
--- a/changelogs/unreleased/61339-Add-underline-to-attach-a-file.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add hover and focus to Attach a file
-merge_request: 28682
-author:
-type: fixed
diff --git a/changelogs/unreleased/61393-emoji-button.yml b/changelogs/unreleased/61393-emoji-button.yml
deleted file mode 100644
index 2bcfde308db..00000000000
--- a/changelogs/unreleased/61393-emoji-button.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Change default color of award emoji button
-merge_request:
-author:
-type: other
diff --git a/changelogs/unreleased/61441.yml b/changelogs/unreleased/61441.yml
deleted file mode 100644
index 2ad0c6f62d3..00000000000
--- a/changelogs/unreleased/61441.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Allow user to set primary email first when 2FA is required
-merge_request: 28097
-author: Kartikey Tanna
-type: fixed
diff --git a/changelogs/unreleased/61511-add-expand-collapse-to-project-operation-settings.yml b/changelogs/unreleased/61511-add-expand-collapse-to-project-operation-settings.yml
deleted file mode 100644
index 1a3a019e1f4..00000000000
--- a/changelogs/unreleased/61511-add-expand-collapse-to-project-operation-settings.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add expand/collapse to error tracking settings
-merge_request: 28619
-author:
-type: added
diff --git a/changelogs/unreleased/61565-merge-request-discussion-text-jumps-when-resolved.yml b/changelogs/unreleased/61565-merge-request-discussion-text-jumps-when-resolved.yml
deleted file mode 100644
index 718604c9ceb..00000000000
--- a/changelogs/unreleased/61565-merge-request-discussion-text-jumps-when-resolved.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Resolve Merge request discussion text jumps when resolved
-merge_request: 28995
-author:
-type: fixed
diff --git a/changelogs/unreleased/61606-support-string-piwik-website-ids.yml b/changelogs/unreleased/61606-support-string-piwik-website-ids.yml
deleted file mode 100644
index 5c525294132..00000000000
--- a/changelogs/unreleased/61606-support-string-piwik-website-ids.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Supports Matomo/Piwik string website ID (\"Protect Track ID\" plugin)"
-merge_request: 28214
-author: DUVERGIER Claude
-type: fixed \ No newline at end of file
diff --git a/changelogs/unreleased/61629-dependency-installation-error-on-fsevents-1-2-4-with-node-js-12.yml b/changelogs/unreleased/61629-dependency-installation-error-on-fsevents-1-2-4-with-node-js-12.yml
deleted file mode 100644
index bbe43760953..00000000000
--- a/changelogs/unreleased/61629-dependency-installation-error-on-fsevents-1-2-4-with-node-js-12.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update indirect dependency fsevents from 1.2.4 to 1.2.9
-merge_request: 28220
-author: Takuya Noguchi
-type: other
diff --git a/changelogs/unreleased/61639-flaky-spec-issue-boards-labels-creates-project-label-spec-features-boards-sidebar_spec-rb-350.yml b/changelogs/unreleased/61639-flaky-spec-issue-boards-labels-creates-project-label-spec-features-boards-sidebar_spec-rb-350.yml
deleted file mode 100644
index 9b4f13353f5..00000000000
--- a/changelogs/unreleased/61639-flaky-spec-issue-boards-labels-creates-project-label-spec-features-boards-sidebar_spec-rb-350.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix dropdown position when loading remote data
-merge_request: 28526
-author:
-type: fixed
diff --git a/changelogs/unreleased/61697-add-project-id-to-le-common-name.yml b/changelogs/unreleased/61697-add-project-id-to-le-common-name.yml
deleted file mode 100644
index 8ffa8d0a51a..00000000000
--- a/changelogs/unreleased/61697-add-project-id-to-le-common-name.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Prevent common name collisions when requesting multiple Let's Encrypt certificates concurrently
-merge_request: 28373
-author:
-type: fixed
diff --git a/changelogs/unreleased/61788-predefined-colours-dont-have-descriptive-labels.yml b/changelogs/unreleased/61788-predefined-colours-dont-have-descriptive-labels.yml
deleted file mode 100644
index 25c83d24007..00000000000
--- a/changelogs/unreleased/61788-predefined-colours-dont-have-descriptive-labels.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Adds a text label to color pickers to improve accessibility.
-merge_request: 28343
-author: Chris Toynbee
-type: changed
diff --git a/changelogs/unreleased/61795-fix-error-when-moving-issues.yml b/changelogs/unreleased/61795-fix-error-when-moving-issues.yml
deleted file mode 100644
index 6812baa07c3..00000000000
--- a/changelogs/unreleased/61795-fix-error-when-moving-issues.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove unintended error message shown when moving issues
-merge_request: 28317
-author:
-type: fixed
diff --git a/changelogs/unreleased/61821-tooltip-consistency.yml b/changelogs/unreleased/61821-tooltip-consistency.yml
deleted file mode 100644
index 9b131907ebf..00000000000
--- a/changelogs/unreleased/61821-tooltip-consistency.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Resolve Tooltip Consistency
-merge_request: 28839
-author:
-type: fixed
diff --git a/changelogs/unreleased/61827-prevent-user-popover-icon-shrink.yml b/changelogs/unreleased/61827-prevent-user-popover-icon-shrink.yml
deleted file mode 100644
index 4d6464eed52..00000000000
--- a/changelogs/unreleased/61827-prevent-user-popover-icon-shrink.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Prevent icons from shrinking in User popover when contents exceed container
-merge_request: 28696
-author:
-type: fixed
diff --git a/changelogs/unreleased/61880-download-btn-group.yml b/changelogs/unreleased/61880-download-btn-group.yml
deleted file mode 100644
index c1f6b2767c6..00000000000
--- a/changelogs/unreleased/61880-download-btn-group.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Group download buttons into a .btn-group
-merge_request:
-author:
-type: other
diff --git a/changelogs/unreleased/61914-fix-emojis-urls.yml b/changelogs/unreleased/61914-fix-emojis-urls.yml
deleted file mode 100644
index 578edf4a063..00000000000
--- a/changelogs/unreleased/61914-fix-emojis-urls.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix emojis URLs
-merge_request: 28371
-author:
-type: fixed
diff --git a/changelogs/unreleased/61928-remove-throttle-from-dirty-submit.yml b/changelogs/unreleased/61928-remove-throttle-from-dirty-submit.yml
deleted file mode 100644
index f8ef5dbb53b..00000000000
--- a/changelogs/unreleased/61928-remove-throttle-from-dirty-submit.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Fix issue that causes "Save changes" button in project settings pages to be
- enabled/disabled incorrectly when changes are made to the form
-merge_request: 28377
-author:
-type: fixed
diff --git a/changelogs/unreleased/61960-translatable-strings-in-issue-closure-emails.yml b/changelogs/unreleased/61960-translatable-strings-in-issue-closure-emails.yml
deleted file mode 100644
index 50b3efba0a5..00000000000
--- a/changelogs/unreleased/61960-translatable-strings-in-issue-closure-emails.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: I18n for issue closure reason in emails
-merge_request: 28489
-author: Michał Zając
-type: changed
diff --git a/changelogs/unreleased/61988-collapse-icon-on-merge-request-diff-larger-than-profile-picture.yml b/changelogs/unreleased/61988-collapse-icon-on-merge-request-diff-larger-than-profile-picture.yml
deleted file mode 100644
index 4d2f73ce2ff..00000000000
--- a/changelogs/unreleased/61988-collapse-icon-on-merge-request-diff-larger-than-profile-picture.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Change collapse icon size to size of profile picture
-merge_request: 28512
-author:
-type: other
diff --git a/changelogs/unreleased/61990-spinner.yml b/changelogs/unreleased/61990-spinner.yml
deleted file mode 100644
index 27d35e56cc9..00000000000
--- a/changelogs/unreleased/61990-spinner.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Updates loading icon in commits page
-merge_request: 28475
-author:
-type: fixed
diff --git a/changelogs/unreleased/62061-note-icon-color.yml b/changelogs/unreleased/62061-note-icon-color.yml
deleted file mode 100644
index 5bfea1a9ed3..00000000000
--- a/changelogs/unreleased/62061-note-icon-color.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update icon color to match design system, pass accessibility
-merge_request: 28498
-author: Jarek Ostrowski @jareko
-type: fixed
diff --git a/changelogs/unreleased/62091-remove-time-windows-flag.yml b/changelogs/unreleased/62091-remove-time-windows-flag.yml
deleted file mode 100644
index c6c11328312..00000000000
--- a/changelogs/unreleased/62091-remove-time-windows-flag.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Allow users to specify a time range on metrics dashboard
-merge_request: 28670
-author:
-type: added
diff --git a/changelogs/unreleased/62092-missing-padding-next-to-time-windows-dropdown-on-metrics-dashboard.yml b/changelogs/unreleased/62092-missing-padding-next-to-time-windows-dropdown-on-metrics-dashboard.yml
deleted file mode 100644
index 3317d505924..00000000000
--- a/changelogs/unreleased/62092-missing-padding-next-to-time-windows-dropdown-on-metrics-dashboard.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Added padding to time window dropdown in monitor dashboard
-merge_request: 28897
-author:
-type: fixed
diff --git a/changelogs/unreleased/62107-fix-detail-page-header-height.yml b/changelogs/unreleased/62107-fix-detail-page-header-height.yml
deleted file mode 100644
index 3723f323bcc..00000000000
--- a/changelogs/unreleased/62107-fix-detail-page-header-height.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix the height of the page headers on issues/merge request/snippets pages
-merge_request: 28650
-author: Erik van der Gaag
-type: fixed
diff --git a/changelogs/unreleased/62116-performance-issue-502-errors-on-rendering-of-issues-with-heavy-markdown-contents.yml b/changelogs/unreleased/62116-performance-issue-502-errors-on-rendering-of-issues-with-heavy-markdown-contents.yml
deleted file mode 100644
index 9596f487116..00000000000
--- a/changelogs/unreleased/62116-performance-issue-502-errors-on-rendering-of-issues-with-heavy-markdown-contents.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Fix performance issue with large Markdown content in issue or merge request
- description
-merge_request: 28597
-author:
-type: performance
diff --git a/changelogs/unreleased/62124-new-threaded-discussion-design.yml b/changelogs/unreleased/62124-new-threaded-discussion-design.yml
deleted file mode 100644
index 6614e05be74..00000000000
--- a/changelogs/unreleased/62124-new-threaded-discussion-design.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Implement borderless discussion design with new reply field
-merge_request: 28580
-author:
-type: added
diff --git a/changelogs/unreleased/62134-fix-non-wraping-project-description.yml b/changelogs/unreleased/62134-fix-non-wraping-project-description.yml
deleted file mode 100644
index 8c734c526fe..00000000000
--- a/changelogs/unreleased/62134-fix-non-wraping-project-description.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Correctly word-wrapping project descriptions with very long words
-merge_request: 28695
-author: Erik van der Gaag
-type: fixed
diff --git a/changelogs/unreleased/62144-fix-option-dropdown-button-size.yml b/changelogs/unreleased/62144-fix-option-dropdown-button-size.yml
deleted file mode 100644
index 86d8f4536f9..00000000000
--- a/changelogs/unreleased/62144-fix-option-dropdown-button-size.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix inconsistent option dropdown button height to match adjacent button
-merge_request: 29096
-author:
-type: fixed
diff --git a/changelogs/unreleased/62154-fe-create-fix-long-branch-name-in-dropdown.yml b/changelogs/unreleased/62154-fe-create-fix-long-branch-name-in-dropdown.yml
deleted file mode 100644
index 1d951c1dc24..00000000000
--- a/changelogs/unreleased/62154-fe-create-fix-long-branch-name-in-dropdown.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Add support to view entirety of long branch name in dropdown instead of it
- being cut off
-merge_request: 29069
-author:
-type: fixed
diff --git a/changelogs/unreleased/62227-webkit-icon-overlap.yml b/changelogs/unreleased/62227-webkit-icon-overlap.yml
deleted file mode 100644
index 47d7583f4c2..00000000000
--- a/changelogs/unreleased/62227-webkit-icon-overlap.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add style to disable webkit icons for search inputs
-merge_request: 28833
-author: Jarek Ostrowski @jareko
-type: fixed
diff --git a/changelogs/unreleased/62253-add-kubernetes-logs-to-monitoring-ui.yml b/changelogs/unreleased/62253-add-kubernetes-logs-to-monitoring-ui.yml
deleted file mode 100644
index c01106a15ec..00000000000
--- a/changelogs/unreleased/62253-add-kubernetes-logs-to-monitoring-ui.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add Kubernetes logs to Admin Logs UI
-merge_request: 28685
-author:
-type: added
diff --git a/changelogs/unreleased/62300-target-area-for-dropdown-list-items-is-too-small-on-metrics-dashboard.yml b/changelogs/unreleased/62300-target-area-for-dropdown-list-items-is-too-small-on-metrics-dashboard.yml
deleted file mode 100644
index 7944e6faa27..00000000000
--- a/changelogs/unreleased/62300-target-area-for-dropdown-list-items-is-too-small-on-metrics-dashboard.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Enlarge metrics time-window dropdown links
-merge_request: 29458
-author:
-type: fixed
diff --git a/changelogs/unreleased/62408-dropdown-truncate.yml b/changelogs/unreleased/62408-dropdown-truncate.yml
deleted file mode 100644
index 7204016efdf..00000000000
--- a/changelogs/unreleased/62408-dropdown-truncate.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix job name in graph dropdown overflowing
-merge_request: 28824
-author:
-type: fixed
diff --git a/changelogs/unreleased/62418-project-default-git-depth.yml b/changelogs/unreleased/62418-project-default-git-depth.yml
deleted file mode 100644
index b5647cd0859..00000000000
--- a/changelogs/unreleased/62418-project-default-git-depth.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add project level git depth CI/CD setting
-merge_request: 28919
-author:
-type: added
diff --git a/changelogs/unreleased/62432-fix-participants-wrapping.yml b/changelogs/unreleased/62432-fix-participants-wrapping.yml
deleted file mode 100644
index a7e4bd372de..00000000000
--- a/changelogs/unreleased/62432-fix-participants-wrapping.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix participants list wrapping
-merge_request: 28873
-author:
-type: fixed
diff --git a/changelogs/unreleased/62485-label-weights.yml b/changelogs/unreleased/62485-label-weights.yml
deleted file mode 100644
index 354b18be11e..00000000000
--- a/changelogs/unreleased/62485-label-weights.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Give labels consistent weight
-merge_request: 28895
-author:
-type: fixed
diff --git a/changelogs/unreleased/62487-external-policy-desc.yml b/changelogs/unreleased/62487-external-policy-desc.yml
deleted file mode 100644
index 2e787b89db1..00000000000
--- a/changelogs/unreleased/62487-external-policy-desc.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Move text under p tag
-merge_request: 28901
-author:
-type: fixed
diff --git a/changelogs/unreleased/62656-adjusted-dropdown-styles.yml b/changelogs/unreleased/62656-adjusted-dropdown-styles.yml
deleted file mode 100644
index 36f14ae2741..00000000000
--- a/changelogs/unreleased/62656-adjusted-dropdown-styles.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "changed the styles on `Add List` dropdown to look more like the EE vesion"
-merge_request: 29338
-author: Michel Engelen
-type: changed
diff --git a/changelogs/unreleased/62684-add-index-public-email-on-users.yml b/changelogs/unreleased/62684-add-index-public-email-on-users.yml
deleted file mode 100644
index 56b5f91da21..00000000000
--- a/changelogs/unreleased/62684-add-index-public-email-on-users.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add index on public_email for users
-merge_request: 29430
-author:
-type: performance
diff --git a/changelogs/unreleased/62685-add-index-invite-email-to-members.yml b/changelogs/unreleased/62685-add-index-invite-email-to-members.yml
deleted file mode 100644
index 80bb05e1709..00000000000
--- a/changelogs/unreleased/62685-add-index-invite-email-to-members.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add index on invite_email for members
-merge_request: 29768
-author:
-type: performance
diff --git a/changelogs/unreleased/62788-clean-up-pagination.yml b/changelogs/unreleased/62788-clean-up-pagination.yml
deleted file mode 100644
index 05e3a4527b8..00000000000
--- a/changelogs/unreleased/62788-clean-up-pagination.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Moves the table pagination shared component
-merge_request:
-author:
-type: other
diff --git a/changelogs/unreleased/62788-graphql-pagination.yml b/changelogs/unreleased/62788-graphql-pagination.yml
deleted file mode 100644
index a7bc317a08f..00000000000
--- a/changelogs/unreleased/62788-graphql-pagination.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Adds pagination component for graphql api
-merge_request: 29277
-author:
-type: added
diff --git a/changelogs/unreleased/62847-url-for-the-next-request-with-pagination-is-missing-port.yml b/changelogs/unreleased/62847-url-for-the-next-request-with-pagination-is-missing-port.yml
deleted file mode 100644
index fca92a0d4dc..00000000000
--- a/changelogs/unreleased/62847-url-for-the-next-request-with-pagination-is-missing-port.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Include the port in the URLs of the API Link headers
-merge_request: 29267
-author:
-type: fixed
diff --git a/changelogs/unreleased/62910-task-completion-status-gql-pderichs.yml b/changelogs/unreleased/62910-task-completion-status-gql-pderichs.yml
deleted file mode 100644
index dcbfa7c185d..00000000000
--- a/changelogs/unreleased/62910-task-completion-status-gql-pderichs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Make task completion status available via GraphQL
-merge_request:
-author:
-type: added
diff --git a/changelogs/unreleased/62966-embed-zoom-call-in-issue-mvc.yml b/changelogs/unreleased/62966-embed-zoom-call-in-issue-mvc.yml
deleted file mode 100644
index a41873f671e..00000000000
--- a/changelogs/unreleased/62966-embed-zoom-call-in-issue-mvc.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add Join meeting button to issues with Zoom links
-merge_request: 29454
-author:
-type: added
diff --git a/changelogs/unreleased/62974-follow-up-from-wip-align-merge-request-icons-and-text.yml b/changelogs/unreleased/62974-follow-up-from-wip-align-merge-request-icons-and-text.yml
deleted file mode 100644
index 811986e6857..00000000000
--- a/changelogs/unreleased/62974-follow-up-from-wip-align-merge-request-icons-and-text.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'Make margin between buttons consistent'
-merge_request: 29378
-author:
-type: other
diff --git a/changelogs/unreleased/63079-exclude-k8s-namespaces-with-no-service-account-token.yml b/changelogs/unreleased/63079-exclude-k8s-namespaces-with-no-service-account-token.yml
deleted file mode 100644
index 9dc99c8a62f..00000000000
--- a/changelogs/unreleased/63079-exclude-k8s-namespaces-with-no-service-account-token.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Ensure a Kubernetes namespace is not used for deployments if there is no service
- account token associated with it
-merge_request: 29643
-author:
-type: fixed
diff --git a/changelogs/unreleased/63417-add-missing-class.yml b/changelogs/unreleased/63417-add-missing-class.yml
deleted file mode 100644
index 3030f5c57e4..00000000000
--- a/changelogs/unreleased/63417-add-missing-class.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Indent collapsible sections
-merge_request: 29804
-author:
-type: other
diff --git a/changelogs/unreleased/63513-ensure-gitlab-jsoncache-includes-the-gitlab-version-in-the-cache-key.yml b/changelogs/unreleased/63513-ensure-gitlab-jsoncache-includes-the-gitlab-version-in-the-cache-key.yml
new file mode 100644
index 00000000000..b5715902630
--- /dev/null
+++ b/changelogs/unreleased/63513-ensure-gitlab-jsoncache-includes-the-gitlab-version-in-the-cache-key.yml
@@ -0,0 +1,5 @@
+---
+title: Include the GitLab version in the cache key for Gitlab::JsonCache
+merge_request: 29938
+author:
+type: fixed
diff --git a/changelogs/unreleased/8723-geo-remove-gitlab-lfstoken-legacyredisdevisetoken-implementation-and-usage-geo.yml b/changelogs/unreleased/8723-geo-remove-gitlab-lfstoken-legacyredisdevisetoken-implementation-and-usage-geo.yml
deleted file mode 100644
index 173c7d9383e..00000000000
--- a/changelogs/unreleased/8723-geo-remove-gitlab-lfstoken-legacyredisdevisetoken-implementation-and-usage-geo.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'Geo: Remove Gitlab::LfsToken::LegacyRedisDeviseToken implementation and usage'
-merge_request: 28546
-author:
-type: changed
diff --git a/changelogs/unreleased/9121-sort-relative-position.yml b/changelogs/unreleased/9121-sort-relative-position.yml
deleted file mode 100644
index adc9e87e5bb..00000000000
--- a/changelogs/unreleased/9121-sort-relative-position.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Allow issue list to be sorted by relative order
-merge_request: 28566
-author:
-type: added
diff --git a/changelogs/unreleased/9186-implement-atmtwps-state-to-mr-widget.yml b/changelogs/unreleased/9186-implement-atmtwps-state-to-mr-widget.yml
deleted file mode 100644
index 2c1d56f197e..00000000000
--- a/changelogs/unreleased/9186-implement-atmtwps-state-to-mr-widget.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update the merge request widget's "Merge" button to support merge trains
-merge_request: 27594
-author:
-type: added
diff --git a/changelogs/unreleased/9578-adjust-milestone-completion-rate.yml b/changelogs/unreleased/9578-adjust-milestone-completion-rate.yml
deleted file mode 100644
index 0694e1462cf..00000000000
--- a/changelogs/unreleased/9578-adjust-milestone-completion-rate.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Adjust milestone completion rate to be based on issues count.
-merge_request: 28777
-author:
-type: changed
diff --git a/changelogs/unreleased/9978-moved-code-differences-from-EE-to-CE.yml b/changelogs/unreleased/9978-moved-code-differences-from-EE-to-CE.yml
deleted file mode 100644
index 821e5d70dca..00000000000
--- a/changelogs/unreleased/9978-moved-code-differences-from-EE-to-CE.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Moved EE/CE code differences for `app/assets/javascripts/gl_dropdown.js` into CE"
-merge_request: 28711
-author: Michel Engelen
-type: other
diff --git a/changelogs/unreleased/abstract-auto-merge.yml b/changelogs/unreleased/abstract-auto-merge.yml
deleted file mode 100644
index d3069a3e500..00000000000
--- a/changelogs/unreleased/abstract-auto-merge.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Refactor and abstract Auto Merge Processes
-merge_request: 28595
-author:
-type: other
diff --git a/changelogs/unreleased/ac-63020-typeerror-nil-can-t-be-coerced-into-integer.yml b/changelogs/unreleased/ac-63020-typeerror-nil-can-t-be-coerced-into-integer.yml
deleted file mode 100644
index 51ac2358fba..00000000000
--- a/changelogs/unreleased/ac-63020-typeerror-nil-can-t-be-coerced-into-integer.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix nil coercion updating storage size on project statistics
-merge_request: 29425
-author:
-type: fixed
diff --git a/changelogs/unreleased/ac-graphql-stats.yml b/changelogs/unreleased/ac-graphql-stats.yml
deleted file mode 100644
index 8837dce4d89..00000000000
--- a/changelogs/unreleased/ac-graphql-stats.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add Namespace and ProjectStatistics to GraphQL API
-merge_request: 28277
-author:
-type: added
diff --git a/changelogs/unreleased/ac-graphql-wikisize.yml b/changelogs/unreleased/ac-graphql-wikisize.yml
deleted file mode 100644
index be9c347ec21..00000000000
--- a/changelogs/unreleased/ac-graphql-wikisize.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Expose wiki_size on GraphQL API
-merge_request: 29123
-author:
-type: added
diff --git a/changelogs/unreleased/ac-namespaces-stats-no-coalesce.yml b/changelogs/unreleased/ac-namespaces-stats-no-coalesce.yml
deleted file mode 100644
index bd005206d4e..00000000000
--- a/changelogs/unreleased/ac-namespaces-stats-no-coalesce.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Forbid NULL in project_statistics.packages_size
-merge_request: 28400
-author:
-type: other
diff --git a/changelogs/unreleased/add-allow_failure-to-job-api.yml b/changelogs/unreleased/add-allow_failure-to-job-api.yml
deleted file mode 100644
index 5dd2b9708c5..00000000000
--- a/changelogs/unreleased/add-allow_failure-to-job-api.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add allow_failure attribute to Job API
-merge_request: 28406
-author:
-type: added
diff --git a/changelogs/unreleased/add-branch-to-project-search-api.yml b/changelogs/unreleased/add-branch-to-project-search-api.yml
deleted file mode 100644
index 74cff94ab76..00000000000
--- a/changelogs/unreleased/add-branch-to-project-search-api.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Added ref querystring parameter to project search API to allow searching on branches/tags other than the default
-merge_request: 28069
-author: Lee Tickett
-type: added
diff --git a/changelogs/unreleased/add-constraint-for-milestone-dates.yml b/changelogs/unreleased/add-constraint-for-milestone-dates.yml
deleted file mode 100644
index 485149cf62e..00000000000
--- a/changelogs/unreleased/add-constraint-for-milestone-dates.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Limit milestone dates to before year 9999
-merge_request: 28742
-author: Luke Picciau
-type: fixed
diff --git a/changelogs/unreleased/add-lfs-blob-ids-to-tree-type.yml b/changelogs/unreleased/add-lfs-blob-ids-to-tree-type.yml
deleted file mode 100644
index 14a5ef1cef3..00000000000
--- a/changelogs/unreleased/add-lfs-blob-ids-to-tree-type.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add LFS oid to GraphQL blob type
-merge_request: 28666
-author:
-type: added
diff --git a/changelogs/unreleased/add-warning-to-backup-rake-task.yml b/changelogs/unreleased/add-warning-to-backup-rake-task.yml
deleted file mode 100644
index 7ddeae3f9fd..00000000000
--- a/changelogs/unreleased/add-warning-to-backup-rake-task.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add warning that gitlab-secrets isn't included in backup
-merge_request:
-author:
-type: other
diff --git a/changelogs/unreleased/add-wiki-size-to-statistics.yml b/changelogs/unreleased/add-wiki-size-to-statistics.yml
deleted file mode 100644
index 85b6d7a1774..00000000000
--- a/changelogs/unreleased/add-wiki-size-to-statistics.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add wiki size to project statistics
-merge_request: 25321
-author: Peter Marko
-type: added
diff --git a/changelogs/unreleased/allow-emoji-in-references.yml b/changelogs/unreleased/allow-emoji-in-references.yml
deleted file mode 100644
index 3116b346c00..00000000000
--- a/changelogs/unreleased/allow-emoji-in-references.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Allow references to labels and milestones to contain emoji
-merge_request: 29284
-author:
-type: changed
diff --git a/changelogs/unreleased/always-show-pipelines-must-succeed-checkbox.yml b/changelogs/unreleased/always-show-pipelines-must-succeed-checkbox.yml
deleted file mode 100644
index d60dd65be8a..00000000000
--- a/changelogs/unreleased/always-show-pipelines-must-succeed-checkbox.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Always show "Pipelines must succeed" checkbox
-merge_request: 28651
-author:
-type: fixed
diff --git a/changelogs/unreleased/antonyliu-i18n-user-profile.yml b/changelogs/unreleased/antonyliu-i18n-user-profile.yml
deleted file mode 100644
index f9065ee5697..00000000000
--- a/changelogs/unreleased/antonyliu-i18n-user-profile.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'i18n: externalize strings from user profile settings'
-merge_request: 28088
-author: Antony Liu
-type: other
diff --git a/changelogs/unreleased/api_make_protected_boolean_type.yml b/changelogs/unreleased/api_make_protected_boolean_type.yml
deleted file mode 100644
index 765edea6427..00000000000
--- a/changelogs/unreleased/api_make_protected_boolean_type.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'API: change protected attribute type to Boolean'
-merge_request: 28766
-author:
-type: other
diff --git a/changelogs/unreleased/api_masked_variables.yml b/changelogs/unreleased/api_masked_variables.yml
deleted file mode 100644
index 3605339cb91..00000000000
--- a/changelogs/unreleased/api_masked_variables.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'API: Allow to get and set "masked" attribute for variables'
-merge_request: 28381
-author: Mathieu Parent
-type: added
diff --git a/changelogs/unreleased/asciidoc-include-directive.yml b/changelogs/unreleased/asciidoc-include-directive.yml
deleted file mode 100644
index 58fe3666727..00000000000
--- a/changelogs/unreleased/asciidoc-include-directive.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add support for AsciiDoc include directive
-merge_request: 28417
-author: "Jakub Jirutka & Guillaume Grossetie"
-type: added
diff --git a/changelogs/unreleased/auto-devops-kubernestes-bump1-11-10.yml b/changelogs/unreleased/auto-devops-kubernestes-bump1-11-10.yml
deleted file mode 100644
index 9ba55719bdf..00000000000
--- a/changelogs/unreleased/auto-devops-kubernestes-bump1-11-10.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Bumps Kubernetes in Auto DevOps to 1.11.10
-merge_request: 28525
-author:
-type: other
diff --git a/changelogs/unreleased/backport-schema-changes.yml b/changelogs/unreleased/backport-schema-changes.yml
deleted file mode 100644
index 58f3ca72b0b..00000000000
--- a/changelogs/unreleased/backport-schema-changes.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Backport the EE schema and migrations to CE
-merge_request: 26940
-author: Yorick Peterse
-type: other
diff --git a/changelogs/unreleased/backstage-gb-improve-jobs-controller-performance.yml b/changelogs/unreleased/backstage-gb-improve-jobs-controller-performance.yml
deleted file mode 100644
index 2b5a3592775..00000000000
--- a/changelogs/unreleased/backstage-gb-improve-jobs-controller-performance.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Improve performance of jobs controller
-merge_request: 28093
-author:
-type: performance
diff --git a/changelogs/unreleased/bump-auto-devops-helm-2-14-0.yml b/changelogs/unreleased/bump-auto-devops-helm-2-14-0.yml
deleted file mode 100644
index ecfbc97a8c5..00000000000
--- a/changelogs/unreleased/bump-auto-devops-helm-2-14-0.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Bump Helm version in Auto-DevOps.gitlab-ci.yml to 2.14.0
-merge_request: 28527
-author:
-type: other
diff --git a/changelogs/unreleased/bvl-comments-graphql.yml b/changelogs/unreleased/bvl-comments-graphql.yml
deleted file mode 100644
index 9f510a910a3..00000000000
--- a/changelogs/unreleased/bvl-comments-graphql.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Expose notes and discussions in GraphQL
-merge_request: 29212
-author:
-type: added
diff --git a/changelogs/unreleased/bvl-graphql-multiplex.yml b/changelogs/unreleased/bvl-graphql-multiplex.yml
deleted file mode 100644
index 56d39e447a5..00000000000
--- a/changelogs/unreleased/bvl-graphql-multiplex.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Support multiplex GraphQL queries
-merge_request: 28273
-author:
-type: added
diff --git a/changelogs/unreleased/bvl-use-global-ids-graphql.yml b/changelogs/unreleased/bvl-use-global-ids-graphql.yml
deleted file mode 100644
index 34cb65e6001..00000000000
--- a/changelogs/unreleased/bvl-use-global-ids-graphql.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use global IDs when exposing GraphQL resources
-merge_request: 29080
-author:
-type: added
diff --git a/changelogs/unreleased/cancel-auto-merge-when-branch-is-changed.yml b/changelogs/unreleased/cancel-auto-merge-when-branch-is-changed.yml
deleted file mode 100644
index c3c6e4322a2..00000000000
--- a/changelogs/unreleased/cancel-auto-merge-when-branch-is-changed.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Cancel Auto Merge when target branch is changed
-merge_request: 29416
-author:
-type: fixed
diff --git a/changelogs/unreleased/cancel-auto-merge-when-merge-request-is-closed.yml b/changelogs/unreleased/cancel-auto-merge-when-merge-request-is-closed.yml
deleted file mode 100644
index d38046ebcbf..00000000000
--- a/changelogs/unreleased/cancel-auto-merge-when-merge-request-is-closed.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Cancel auto merge when merge request is closed
-merge_request: 28782
-author:
-type: fixed
diff --git a/changelogs/unreleased/ce-57402-add-issues-statistics-api-endpoints.yml b/changelogs/unreleased/ce-57402-add-issues-statistics-api-endpoints.yml
deleted file mode 100644
index a626193dc27..00000000000
--- a/changelogs/unreleased/ce-57402-add-issues-statistics-api-endpoints.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add issues_statistics api endpoints and extend issues search api
-merge_request: 27366
-author:
-type: added
diff --git a/changelogs/unreleased/ce-jej-fix-git-http-with-sso-enforcement.yml b/changelogs/unreleased/ce-jej-fix-git-http-with-sso-enforcement.yml
deleted file mode 100644
index a795e33b00d..00000000000
--- a/changelogs/unreleased/ce-jej-fix-git-http-with-sso-enforcement.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Avoid setting Gitlab::Session on sessionless requests and Git HTTP
-merge_request: 29146
-author:
-type: fixed
diff --git a/changelogs/unreleased/ce-quick-fix-58727-collapsed-sidebar-flyout-menu-items-don-t-appear-in-1200px-screen-size.yml b/changelogs/unreleased/ce-quick-fix-58727-collapsed-sidebar-flyout-menu-items-don-t-appear-in-1200px-screen-size.yml
deleted file mode 100644
index 332105bb269..00000000000
--- a/changelogs/unreleased/ce-quick-fix-58727-collapsed-sidebar-flyout-menu-items-don-t-appear-in-1200px-screen-size.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix flyout nav on small viewports
-merge_request: 25998
-author:
-type: fixed
diff --git a/changelogs/unreleased/chore-remove-circuit-breaker-api.yml b/changelogs/unreleased/chore-remove-circuit-breaker-api.yml
deleted file mode 100644
index f9532be04c8..00000000000
--- a/changelogs/unreleased/chore-remove-circuit-breaker-api.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove the circuit breaker API
-merge_request: 28669
-author:
-type: removed
diff --git a/changelogs/unreleased/ci-variable-conjunction.yml b/changelogs/unreleased/ci-variable-conjunction.yml
deleted file mode 100644
index 839c4285f3a..00000000000
--- a/changelogs/unreleased/ci-variable-conjunction.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add support for && and || to CI Pipeline Expressions. Change CI variable expression matching for Lexeme::Pattern to eagerly return tokens.
-merge_request: 27925
-author: Martin Manelli
-type: added
diff --git a/changelogs/unreleased/container-registry-api-perms-58271.yml b/changelogs/unreleased/container-registry-api-perms-58271.yml
deleted file mode 100644
index 0d1036a7788..00000000000
--- a/changelogs/unreleased/container-registry-api-perms-58271.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Allow developer role to delete docker tags via container registry API
-merge_request: 29512
-author:
-type: fixed
diff --git a/changelogs/unreleased/copy-button-in-modals.yml b/changelogs/unreleased/copy-button-in-modals.yml
deleted file mode 100644
index bc18eb9ab26..00000000000
--- a/changelogs/unreleased/copy-button-in-modals.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add a New Copy Button That Works in Modals
-merge_request: 28676
-author:
-type: added
diff --git a/changelogs/unreleased/dhiraj-fix-missing-deployment-rockets-in-monitoring-dashboard.yml b/changelogs/unreleased/dhiraj-fix-missing-deployment-rockets-in-monitoring-dashboard.yml
deleted file mode 100644
index 12a21e818b4..00000000000
--- a/changelogs/unreleased/dhiraj-fix-missing-deployment-rockets-in-monitoring-dashboard.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix missing deployment rockets in monitor dashboard
-merge_request: 29574
-author:
-type: fixed
diff --git a/changelogs/unreleased/diff-suggestions-popover.yml b/changelogs/unreleased/diff-suggestions-popover.yml
deleted file mode 100644
index fdb94e6e2a7..00000000000
--- a/changelogs/unreleased/diff-suggestions-popover.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Added diff suggestion feature discovery popover
-merge_request:
-author:
-type: added
diff --git a/changelogs/unreleased/diff-whitespace-setting-changes.yml b/changelogs/unreleased/diff-whitespace-setting-changes.yml
deleted file mode 100644
index 640e9e589df..00000000000
--- a/changelogs/unreleased/diff-whitespace-setting-changes.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fixed show whitespace button not refetching diff content
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/display-junit-classname-in-modal.yml b/changelogs/unreleased/display-junit-classname-in-modal.yml
deleted file mode 100644
index c5140456e4e..00000000000
--- a/changelogs/unreleased/display-junit-classname-in-modal.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Display classname JUnit attribute in report modal
-merge_request: 28376
-author:
-type: added
diff --git a/changelogs/unreleased/dm-http-hostname-override.yml b/changelogs/unreleased/dm-http-hostname-override.yml
deleted file mode 100644
index f84f36a0010..00000000000
--- a/changelogs/unreleased/dm-http-hostname-override.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Protect Gitlab::HTTP against DNS rebinding attack
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/docs-add-chatops-request-doc.yml b/changelogs/unreleased/docs-add-chatops-request-doc.yml
deleted file mode 100644
index 85ba86a73af..00000000000
--- a/changelogs/unreleased/docs-add-chatops-request-doc.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add section to dev docs on accessing chatops
-merge_request: 28623
-author:
-type: other
diff --git a/changelogs/unreleased/dz-patch-58.yml b/changelogs/unreleased/dz-patch-58.yml
deleted file mode 100644
index 97ceadd303d..00000000000
--- a/changelogs/unreleased/dz-patch-58.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Replace Oxygen-Sans font with Noto Sans
-merge_request: 28322
-author:
-type: changed
diff --git a/changelogs/unreleased/dz-scope-project-routes.yml b/changelogs/unreleased/dz-scope-project-routes.yml
deleted file mode 100644
index 66eb5d928f0..00000000000
--- a/changelogs/unreleased/dz-scope-project-routes.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Move some project routes under /-/ scope
-merge_request: 28435
-author:
-type: changed
diff --git a/changelogs/unreleased/ee-11040-added-conditional-rendering.yml b/changelogs/unreleased/ee-11040-added-conditional-rendering.yml
deleted file mode 100644
index 7b06e43830f..00000000000
--- a/changelogs/unreleased/ee-11040-added-conditional-rendering.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Added conditional rendering to `app/views/search/_form.html.haml` for CE/EE code base consistency"
-merge_request: 28883
-author: Michel Engelen
-type: other
diff --git a/changelogs/unreleased/ensure_namespace.yml b/changelogs/unreleased/ensure_namespace.yml
deleted file mode 100644
index ce2a615af1f..00000000000
--- a/changelogs/unreleased/ensure_namespace.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: AutoDevops function ensure_namespace() now explicitly tests the namespace
-merge_request: 29567
-author: Jack Lei
-type: fixed
diff --git a/changelogs/unreleased/error-pipelines-for-blocked-users.yml b/changelogs/unreleased/error-pipelines-for-blocked-users.yml
deleted file mode 100644
index 3ace28b6cfd..00000000000
--- a/changelogs/unreleased/error-pipelines-for-blocked-users.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: preventing blocked users and their PipelineSchdules from creating new Pipelines
-merge_request: 27318
-author:
-type: fixed
diff --git a/changelogs/unreleased/expose-project-git-depth-via-api.yml b/changelogs/unreleased/expose-project-git-depth-via-api.yml
deleted file mode 100644
index e9d158fda16..00000000000
--- a/changelogs/unreleased/expose-project-git-depth-via-api.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Get and edit ci_default_git_depth via project API
-merge_request: 29353
-author:
-type: added
diff --git a/changelogs/unreleased/fe-fix-gl-dropdown-scrolling-to-top.yml b/changelogs/unreleased/fe-fix-gl-dropdown-scrolling-to-top.yml
deleted file mode 100644
index 4125b4241e6..00000000000
--- a/changelogs/unreleased/fe-fix-gl-dropdown-scrolling-to-top.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix scrolling to top on assignee change
-merge_request: 29500
-author:
-type: fixed
diff --git a/changelogs/unreleased/feature-gb-use-gitlabktl-to-build-serverless-applications.yml b/changelogs/unreleased/feature-gb-use-gitlabktl-to-build-serverless-applications.yml
deleted file mode 100644
index 443fff92f55..00000000000
--- a/changelogs/unreleased/feature-gb-use-gitlabktl-to-build-serverless-applications.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use to 'gitlabktl' build serverless applications
-merge_request: 29258
-author:
-type: added
diff --git a/changelogs/unreleased/feature-require-2fa-for-all-entities-in-group.yml b/changelogs/unreleased/feature-require-2fa-for-all-entities-in-group.yml
deleted file mode 100644
index 0abe777fb69..00000000000
--- a/changelogs/unreleased/feature-require-2fa-for-all-entities-in-group.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-title: Apply the group setting "require 2FA" across all subgroup members as well when changing the group setting
-merge_request: 24965
-author: rroger
-type: changed
diff --git a/changelogs/unreleased/fix-allow-lower-case-issue-ids.yml b/changelogs/unreleased/fix-allow-lower-case-issue-ids.yml
deleted file mode 100644
index 46fa90ccda0..00000000000
--- a/changelogs/unreleased/fix-allow-lower-case-issue-ids.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Allow lowercase prefix for Youtrack issue ids
-merge_request: 29057
-author: Matthias Baur
-type: fixed
diff --git a/changelogs/unreleased/fix-autodevops-postgres-versioning.yml b/changelogs/unreleased/fix-autodevops-postgres-versioning.yml
deleted file mode 100644
index 8ddc70f6314..00000000000
--- a/changelogs/unreleased/fix-autodevops-postgres-versioning.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fixed ignored postgres version that occurs after the first autodevops deploy when specifying custom $POSTGRES_VERSION
-merge_request: 28735
-author: Brandon Dimcheff
-type: fixed
diff --git a/changelogs/unreleased/fix-db-migrate-is-failed-on-mysql8.yml b/changelogs/unreleased/fix-db-migrate-is-failed-on-mysql8.yml
deleted file mode 100644
index 63f134808e3..00000000000
--- a/changelogs/unreleased/fix-db-migrate-is-failed-on-mysql8.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix. `db:migrate` is failed on MySQL 8
-merge_request: 28351
-author: sue445
-type: fixed
diff --git a/changelogs/unreleased/fix-diverged-branch-locals.yml b/changelogs/unreleased/fix-diverged-branch-locals.yml
deleted file mode 100644
index 719d669fad3..00000000000
--- a/changelogs/unreleased/fix-diverged-branch-locals.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix diverged branch locals
-merge_request: 29508
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-flyout-navs.yml b/changelogs/unreleased/fix-flyout-navs.yml
deleted file mode 100644
index c21f1037f09..00000000000
--- a/changelogs/unreleased/fix-flyout-navs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix sidebar flyout navigation
-merge_request: 29571
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-format-date-safari-ff.yml b/changelogs/unreleased/fix-format-date-safari-ff.yml
deleted file mode 100644
index e71ea2867f3..00000000000
--- a/changelogs/unreleased/fix-format-date-safari-ff.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Throw an error when formatDate's input is invalid
-merge_request: 28713
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-gb-fix-serverless-apps-deployment-template.yml b/changelogs/unreleased/fix-gb-fix-serverless-apps-deployment-template.yml
deleted file mode 100644
index 88656b7ef4c..00000000000
--- a/changelogs/unreleased/fix-gb-fix-serverless-apps-deployment-template.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix serverless apps deployments by bumping 'tm' version
-merge_request: 29254
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-gb-remove-serverless-app-build-policies-from-template.yml b/changelogs/unreleased/fix-gb-remove-serverless-app-build-policies-from-template.yml
deleted file mode 100644
index f51ec273a57..00000000000
--- a/changelogs/unreleased/fix-gb-remove-serverless-app-build-policies-from-template.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove build policies from serverless app template
-merge_request: 29253
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-import-member-access.yml b/changelogs/unreleased/fix-import-member-access.yml
deleted file mode 100644
index 5dc4ae738f8..00000000000
--- a/changelogs/unreleased/fix-import-member-access.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix issue importing members with owner access
-merge_request: 28636
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-import-param-ordering.yml b/changelogs/unreleased/fix-import-param-ordering.yml
deleted file mode 100644
index 47e32cda977..00000000000
--- a/changelogs/unreleased/fix-import-param-ordering.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix order dependency with user params during imports
-merge_request: 28719
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-issue-mr-badge.yml b/changelogs/unreleased/fix-issue-mr-badge.yml
deleted file mode 100644
index e777f52f173..00000000000
--- a/changelogs/unreleased/fix-issue-mr-badge.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use grid and correct border radius for status badge
-merge_request:
-author:
-type: other
diff --git a/changelogs/unreleased/fix-milestone-references-with-escaped-html-entities.yml b/changelogs/unreleased/fix-milestone-references-with-escaped-html-entities.yml
deleted file mode 100644
index 1041943f9c4..00000000000
--- a/changelogs/unreleased/fix-milestone-references-with-escaped-html-entities.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix milestone references containing &, <, or >
-merge_request: 28667
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-pipeline-schedule-owner-is-nil.yml b/changelogs/unreleased/fix-pipeline-schedule-owner-is-nil.yml
deleted file mode 100644
index 5c8644d2860..00000000000
--- a/changelogs/unreleased/fix-pipeline-schedule-owner-is-nil.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix pipeline schedules when owner is nil
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-search-dropdown-blur-close.yml b/changelogs/unreleased/fix-search-dropdown-blur-close.yml
deleted file mode 100644
index 1ac9dc674fe..00000000000
--- a/changelogs/unreleased/fix-search-dropdown-blur-close.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix search dropdown not closing on blur if empty
-merge_request: 28730
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-time-window-default.yml b/changelogs/unreleased/fix-time-window-default.yml
deleted file mode 100644
index 147f82eb6c9..00000000000
--- a/changelogs/unreleased/fix-time-window-default.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use the selected time window for metrics dashboard
-merge_request: 29152
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-too-many-loops-cron-error.yml b/changelogs/unreleased/fix-too-many-loops-cron-error.yml
deleted file mode 100644
index a9b5b761439..00000000000
--- a/changelogs/unreleased/fix-too-many-loops-cron-error.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix "too many loops" error by handling gracefully cron schedules for non existent days
-merge_request: 28002
-author:
-type: fixed
diff --git a/changelogs/unreleased/generate-spans-for-sections.yml b/changelogs/unreleased/generate-spans-for-sections.yml
deleted file mode 100644
index e167d66490f..00000000000
--- a/changelogs/unreleased/generate-spans-for-sections.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Adds collapsible sections for job log
-merge_request: 28642
-author:
-type: added
diff --git a/changelogs/unreleased/gitaly-version-v1.43.0.yml b/changelogs/unreleased/gitaly-version-v1.43.0.yml
deleted file mode 100644
index 67acd2725e1..00000000000
--- a/changelogs/unreleased/gitaly-version-v1.43.0.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Upgrade to Gitaly v1.43.0
-merge_request: 28867
-author:
-type: changed
diff --git a/changelogs/unreleased/gitaly-version-v1.47.0.yml b/changelogs/unreleased/gitaly-version-v1.47.0.yml
deleted file mode 100644
index b369506b336..00000000000
--- a/changelogs/unreleased/gitaly-version-v1.47.0.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Upgrade to Gitaly v1.47.0
-merge_request: 29789
-author:
-type: changed
diff --git a/changelogs/unreleased/gt-externalize-profiles-preferences.yml b/changelogs/unreleased/gt-externalize-profiles-preferences.yml
deleted file mode 100644
index 1a72e92a241..00000000000
--- a/changelogs/unreleased/gt-externalize-profiles-preferences.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Externalize profiles preferences
-merge_request: 28470
-author: George Tsiolis
-type: other
diff --git a/changelogs/unreleased/gt-open-visibility-help-link-in-a-new-tab.yml b/changelogs/unreleased/gt-open-visibility-help-link-in-a-new-tab.yml
deleted file mode 100644
index 35515c9d639..00000000000
--- a/changelogs/unreleased/gt-open-visibility-help-link-in-a-new-tab.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Open visibility help link in a new tab
-merge_request: 28603
-author: George Tsiolis
-type: fixed
diff --git a/changelogs/unreleased/hashed-storage-enabled-default.yml b/changelogs/unreleased/hashed-storage-enabled-default.yml
deleted file mode 100644
index 9a34505785c..00000000000
--- a/changelogs/unreleased/hashed-storage-enabled-default.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Hashed Storage is enabled by default on new installations
-merge_request: 29586
-author:
-type: changed
diff --git a/changelogs/unreleased/i18n-active_sessions-in-user-profile.yml b/changelogs/unreleased/i18n-active_sessions-in-user-profile.yml
deleted file mode 100644
index fe6eb3a2bf7..00000000000
--- a/changelogs/unreleased/i18n-active_sessions-in-user-profile.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Externalize strings of active sessions page in user profile
-merge_request: 28590
-author: antony liu
-type: other
diff --git a/changelogs/unreleased/i18n-chat-of-user-profile.yml b/changelogs/unreleased/i18n-chat-of-user-profile.yml
deleted file mode 100644
index 663b4ffc1a1..00000000000
--- a/changelogs/unreleased/i18n-chat-of-user-profile.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Externalize strings of chat page in user profile
-merge_request: 28632
-author:
-type: other
diff --git a/changelogs/unreleased/i18n-email-of-user-profile.yml b/changelogs/unreleased/i18n-email-of-user-profile.yml
deleted file mode 100644
index 6cb718843d5..00000000000
--- a/changelogs/unreleased/i18n-email-of-user-profile.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Externalize strings of email page in user profile
-merge_request: 28587
-author: antony liu
-type: other
diff --git a/changelogs/unreleased/i18n-pgp_ssh_keys-of-user-profile.yml b/changelogs/unreleased/i18n-pgp_ssh_keys-of-user-profile.yml
deleted file mode 100644
index 4dc45b35976..00000000000
--- a/changelogs/unreleased/i18n-pgp_ssh_keys-of-user-profile.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Externalize strings of PGP Keys and SSH Keys page in user profile
-merge_request: 28653
-author: Antony Liu
-type: other
diff --git a/changelogs/unreleased/id-bug-suggested-changes-remove-empty-line.yml b/changelogs/unreleased/id-bug-suggested-changes-remove-empty-line.yml
deleted file mode 100644
index eae2d5f9b2a..00000000000
--- a/changelogs/unreleased/id-bug-suggested-changes-remove-empty-line.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Allow removal of empty lines via suggestions
-merge_request: 28703
-author:
-type: fixed
diff --git a/changelogs/unreleased/ignore-artifact-attirbutes-in-project-import-export.yml b/changelogs/unreleased/ignore-artifact-attirbutes-in-project-import-export.yml
deleted file mode 100644
index 536aae03f59..00000000000
--- a/changelogs/unreleased/ignore-artifact-attirbutes-in-project-import-export.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Ignore legacy artifact columns in Project Import/Export
-merge_request: 29427
-author:
-type: fixed
diff --git a/changelogs/unreleased/improve-email-text-part.yml b/changelogs/unreleased/improve-email-text-part.yml
deleted file mode 100644
index ce506cb1507..00000000000
--- a/changelogs/unreleased/improve-email-text-part.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Improve new user email markup unconsistency between text and html parts
-merge_request: 29111
-author: Haunui Saint-sevin
-type: fixed
diff --git a/changelogs/unreleased/increase-move-issue-dropdown-height.yml b/changelogs/unreleased/increase-move-issue-dropdown-height.yml
deleted file mode 100644
index bb67e9341b2..00000000000
--- a/changelogs/unreleased/increase-move-issue-dropdown-height.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Increase height of move issue dropdown
-merge_request:
-author:
-type: other
diff --git a/changelogs/unreleased/issue-58747.yml b/changelogs/unreleased/issue-58747.yml
deleted file mode 100644
index 01b610576f7..00000000000
--- a/changelogs/unreleased/issue-58747.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix GPG signature verification with recent GnuPG versions
-merge_request: 29388
-author: David Palubin
-type: fixed
diff --git a/changelogs/unreleased/issue_49897.yml b/changelogs/unreleased/issue_49897.yml
deleted file mode 100644
index b630b5143c6..00000000000
--- a/changelogs/unreleased/issue_49897.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Delete unauthorized Todos when project is made private
-merge_request: 28560
-author:
-type: fixed
diff --git a/changelogs/unreleased/jc-migration-for-source-project-id.yml b/changelogs/unreleased/jc-migration-for-source-project-id.yml
deleted file mode 100644
index 3e2e8ebfcc5..00000000000
--- a/changelogs/unreleased/jc-migration-for-source-project-id.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix null source_project_id in pool_repositories
-merge_request: 29157
-author:
-type: other
diff --git a/changelogs/unreleased/jc-omit-count-diverging-commits-max.yml b/changelogs/unreleased/jc-omit-count-diverging-commits-max.yml
deleted file mode 100644
index 23235060a98..00000000000
--- a/changelogs/unreleased/jc-omit-count-diverging-commits-max.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Omit max-count for diverging_commit_counts behind feature flag
-merge_request: 28157
-author:
-type: other
diff --git a/changelogs/unreleased/jivl-migrate-dashboard-store-vuex.yml b/changelogs/unreleased/jivl-migrate-dashboard-store-vuex.yml
deleted file mode 100644
index dc4edbc058f..00000000000
--- a/changelogs/unreleased/jivl-migrate-dashboard-store-vuex.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Migrate the monitoring dashboard store to vuex
-merge_request: 28555
-author:
-type: other
diff --git a/changelogs/unreleased/jupyter_pre_spawn_hook_v2.yml b/changelogs/unreleased/jupyter_pre_spawn_hook_v2.yml
deleted file mode 100644
index c5918df8193..00000000000
--- a/changelogs/unreleased/jupyter_pre_spawn_hook_v2.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Pass user's identity and token from JupyterHub to user's Jupyter environment
-merge_request: 27314
-author: Amit Rathi
-type: added
diff --git a/changelogs/unreleased/kinolaev-master-patch-13154.yml b/changelogs/unreleased/kinolaev-master-patch-13154.yml
deleted file mode 100644
index 3292ff797e2..00000000000
--- a/changelogs/unreleased/kinolaev-master-patch-13154.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'Auto-DevOps: allow to disable rollout status check'
-merge_request: 28130
-author: Sergej Nikolaev <kinolaev@gmail.com>
-type: fixed
diff --git a/changelogs/unreleased/leipert-node-12-compatibility.yml b/changelogs/unreleased/leipert-node-12-compatibility.yml
deleted file mode 100644
index 18025d33a6d..00000000000
--- a/changelogs/unreleased/leipert-node-12-compatibility.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Upgrade dependencies for node 12 compatibility
-merge_request: 28323
-author:
-type: fixed
diff --git a/changelogs/unreleased/make-autocomplete-faster-with-lots-of-results.yml b/changelogs/unreleased/make-autocomplete-faster-with-lots-of-results.yml
deleted file mode 100644
index daeefd3ffd7..00000000000
--- a/changelogs/unreleased/make-autocomplete-faster-with-lots-of-results.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Improve performance of users autocomplete when there are lots of results
-merge_request:
-author:
-type: performance
diff --git a/changelogs/unreleased/mark-comment-resolved.yml b/changelogs/unreleased/mark-comment-resolved.yml
deleted file mode 100644
index 3343d18d16f..00000000000
--- a/changelogs/unreleased/mark-comment-resolved.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Change resolve button text to mark comment as resolved
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/migrate_k8s_service_integration.yml b/changelogs/unreleased/migrate_k8s_service_integration.yml
deleted file mode 100644
index 57f03e6bdab..00000000000
--- a/changelogs/unreleased/migrate_k8s_service_integration.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Migrate Kubernetes service integration templates to clusters
-merge_request: 28534
-author:
-type: added
diff --git a/changelogs/unreleased/mm12935.yml b/changelogs/unreleased/mm12935.yml
deleted file mode 100644
index 782586c514e..00000000000
--- a/changelogs/unreleased/mm12935.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove Content-Type override for Mattermost OAuth login
-merge_request:
-author: Harrison Healey
-type: removed
diff --git a/changelogs/unreleased/osw-avoid-500-on-suggestions-check.yml b/changelogs/unreleased/osw-avoid-500-on-suggestions-check.yml
deleted file mode 100644
index d0a09385d4c..00000000000
--- a/changelogs/unreleased/osw-avoid-500-on-suggestions-check.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Avoid 500 when rendering users ATOM data
-merge_request: 25408
-author:
-type: fixed
diff --git a/changelogs/unreleased/osw-avoid-encoding-errors-on-merge-to-ref-service.yml b/changelogs/unreleased/osw-avoid-encoding-errors-on-merge-to-ref-service.yml
deleted file mode 100644
index 176c8bf36f7..00000000000
--- a/changelogs/unreleased/osw-avoid-encoding-errors-on-merge-to-ref-service.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Handle encoding errors for MergeToRefService
-merge_request: 29440
-author:
-type: fixed
diff --git a/changelogs/unreleased/osw-fix-post-dep-migration-with-timeout.yml b/changelogs/unreleased/osw-fix-post-dep-migration-with-timeout.yml
deleted file mode 100644
index 6b37bb11ad5..00000000000
--- a/changelogs/unreleased/osw-fix-post-dep-migration-with-timeout.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Avoid DB timeouts when scheduling migrations
-merge_request: 29437
-author:
-type: fixed
diff --git a/changelogs/unreleased/osw-reset-merge-status-from-mergeable-mrs.yml b/changelogs/unreleased/osw-reset-merge-status-from-mergeable-mrs.yml
deleted file mode 100644
index 6b5f97f24b3..00000000000
--- a/changelogs/unreleased/osw-reset-merge-status-from-mergeable-mrs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Reset merge status from mergeable MRs
-merge_request: 28843
-author:
-type: other
diff --git a/changelogs/unreleased/patch-55.yml b/changelogs/unreleased/patch-55.yml
deleted file mode 100644
index 7a6d6bfed2f..00000000000
--- a/changelogs/unreleased/patch-55.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Better isolated `Docker.gitlab-ci.yml` to avoid interference with other job configurations.
-merge_request: 28213
-author: lrkwz
-type: changed
diff --git a/changelogs/unreleased/patch-65.yml b/changelogs/unreleased/patch-65.yml
deleted file mode 100644
index 9ce628a6541..00000000000
--- a/changelogs/unreleased/patch-65.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Show tooltip on truncated commit title
-merge_request: 28865
-author: Timofey Trofimov
-type: other
diff --git a/changelogs/unreleased/patch-issue--56683.yml b/changelogs/unreleased/patch-issue--56683.yml
deleted file mode 100644
index 9b82c6c1459..00000000000
--- a/changelogs/unreleased/patch-issue--56683.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Process up to 100 commit messages for references when pushing to a new default
- branch
-merge_request: 29511
-author: Fabio Papa
-type: fixed
diff --git a/changelogs/unreleased/pb-update-gitaly-1-45-0.yml b/changelogs/unreleased/pb-update-gitaly-1-45-0.yml
deleted file mode 100644
index eaad7a8378b..00000000000
--- a/changelogs/unreleased/pb-update-gitaly-1-45-0.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update GITALY_SERVER_VERSION to 1.45.0
-merge_request: 29109
-author:
-type: changed
diff --git a/changelogs/unreleased/pipelines-email-default-branch-filter.yml b/changelogs/unreleased/pipelines-email-default-branch-filter.yml
deleted file mode 100644
index 4c2a54af0bf..00000000000
--- a/changelogs/unreleased/pipelines-email-default-branch-filter.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add notify_only_default_branch option to PipelinesEmailService
-merge_request: 28271
-author: Peter Marko
-type: added
diff --git a/changelogs/unreleased/readonly_k8s_integration.yml b/changelogs/unreleased/readonly_k8s_integration.yml
deleted file mode 100644
index 718705e8750..00000000000
--- a/changelogs/unreleased/readonly_k8s_integration.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Make Kubernetes service templates readonly
-merge_request: 29044
-author:
-type: removed
diff --git a/changelogs/unreleased/referenced-labels.yml b/changelogs/unreleased/referenced-labels.yml
deleted file mode 100644
index c39ef4c2478..00000000000
--- a/changelogs/unreleased/referenced-labels.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add referenced-commands in no overflow list
-merge_request: 28858
-author:
-type: fixed
diff --git a/changelogs/unreleased/relative-urls-for-system-notes.yml b/changelogs/unreleased/relative-urls-for-system-notes.yml
deleted file mode 100644
index ec834e9f277..00000000000
--- a/changelogs/unreleased/relative-urls-for-system-notes.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Change links in system notes to use relative paths
-merge_request: 28588
-author: Luke Picciau
-type: fixed
diff --git a/changelogs/unreleased/remove-grafana-dashboard-link-feature-flag.yml b/changelogs/unreleased/remove-grafana-dashboard-link-feature-flag.yml
deleted file mode 100644
index 24b5fb50e40..00000000000
--- a/changelogs/unreleased/remove-grafana-dashboard-link-feature-flag.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Link to an external dashboard from metrics dashboard
-merge_request: 29369
-author:
-type: added
diff --git a/changelogs/unreleased/remove-legacy-artifacts-related-code.yml b/changelogs/unreleased/remove-legacy-artifacts-related-code.yml
deleted file mode 100644
index acde65af2d4..00000000000
--- a/changelogs/unreleased/remove-legacy-artifacts-related-code.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove legacy artifact related code
-merge_request: 26475
-author:
-type: other
diff --git a/changelogs/unreleased/remove-mr-diff-header-height.yml b/changelogs/unreleased/remove-mr-diff-header-height.yml
deleted file mode 100644
index c06c7281c58..00000000000
--- a/changelogs/unreleased/remove-mr-diff-header-height.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove fixed height from MR diff headers
-merge_request:
-author:
-type: other
diff --git a/changelogs/unreleased/revert-concurrent-pipeline-schedule-creation.yml b/changelogs/unreleased/revert-concurrent-pipeline-schedule-creation.yml
deleted file mode 100644
index 77423463d22..00000000000
--- a/changelogs/unreleased/revert-concurrent-pipeline-schedule-creation.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Revert concurrent pipeline creation for pipeline schedules
-merge_request: 29794
-author:
-type: fixed
diff --git a/changelogs/unreleased/security-58856-persistent-xss-in-note-objects.yml b/changelogs/unreleased/security-58856-persistent-xss-in-note-objects.yml
deleted file mode 100644
index d9ad5af256a..00000000000
--- a/changelogs/unreleased/security-58856-persistent-xss-in-note-objects.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Prevent XSS injection in note imports
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/security-60039.yml b/changelogs/unreleased/security-60039.yml
deleted file mode 100644
index 5edbf32ec97..00000000000
--- a/changelogs/unreleased/security-60039.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Prevent invalid branch for merge request
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/security-60143-address-xss-issue-in-wiki-links.yml b/changelogs/unreleased/security-60143-address-xss-issue-in-wiki-links.yml
deleted file mode 100644
index 5b79258af54..00000000000
--- a/changelogs/unreleased/security-60143-address-xss-issue-in-wiki-links.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Filter relative links in wiki for XSS
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/security-fix-confidential-issue-label-visibility-master.yml b/changelogs/unreleased/security-fix-confidential-issue-label-visibility-master.yml
deleted file mode 100644
index adfd8e1298f..00000000000
--- a/changelogs/unreleased/security-fix-confidential-issue-label-visibility-master.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix confidential issue label disclosure on milestone view
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/security-fix-project-existence-disclosure-master.yml b/changelogs/unreleased/security-fix-project-existence-disclosure-master.yml
deleted file mode 100644
index 084439c71d9..00000000000
--- a/changelogs/unreleased/security-fix-project-existence-disclosure-master.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix url redaction for issue links
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/security-fix_milestones_search_api_leak.yml b/changelogs/unreleased/security-fix_milestones_search_api_leak.yml
deleted file mode 100644
index 5691550b602..00000000000
--- a/changelogs/unreleased/security-fix_milestones_search_api_leak.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'Resolve: Milestones leaked via search API'
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/security-id-leaked-password-in-import-url-frontend.yml b/changelogs/unreleased/security-id-leaked-password-in-import-url-frontend.yml
deleted file mode 100644
index df636ec37fb..00000000000
--- a/changelogs/unreleased/security-id-leaked-password-in-import-url-frontend.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add extra fields for handling basic auth on import by url page
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/security-jej-prevent-web-sign-in-bypass.yml b/changelogs/unreleased/security-jej-prevent-web-sign-in-bypass.yml
deleted file mode 100644
index 02773fa1d7c..00000000000
--- a/changelogs/unreleased/security-jej-prevent-web-sign-in-bypass.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Prevent bypass of restriction disabling web password sign in
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/security-unsubscribing-from-issue.yml b/changelogs/unreleased/security-unsubscribing-from-issue.yml
deleted file mode 100644
index 3a33a457c69..00000000000
--- a/changelogs/unreleased/security-unsubscribing-from-issue.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Hide confidential issue title on unsubscribe for anonymous users
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/set-real-next-run-at-for-preventing-duplciate-pipeline-creations.yml b/changelogs/unreleased/set-real-next-run-at-for-preventing-duplciate-pipeline-creations.yml
deleted file mode 100644
index 04eb035b157..00000000000
--- a/changelogs/unreleased/set-real-next-run-at-for-preventing-duplciate-pipeline-creations.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Make pipeline schedule worker resilient
-merge_request: 28407
-author:
-type: performance
diff --git a/changelogs/unreleased/sh-add-backtrace-to-sql-queries.yml b/changelogs/unreleased/sh-add-backtrace-to-sql-queries.yml
deleted file mode 100644
index d4ca027d1b9..00000000000
--- a/changelogs/unreleased/sh-add-backtrace-to-sql-queries.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add backtraces to Peek performance bar for SQL calls
-merge_request:
-author:
-type: added
diff --git a/changelogs/unreleased/sh-add-header-to-jobs-admin-page.yml b/changelogs/unreleased/sh-add-header-to-jobs-admin-page.yml
deleted file mode 100644
index b089e6e4f37..00000000000
--- a/changelogs/unreleased/sh-add-header-to-jobs-admin-page.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add a column header to admin/jobs page
-merge_request: 28837
-author:
-type: other
diff --git a/changelogs/unreleased/sh-clean-up-bitbucket-import-errors.yml b/changelogs/unreleased/sh-clean-up-bitbucket-import-errors.yml
new file mode 100644
index 00000000000..e4c9de74e6a
--- /dev/null
+++ b/changelogs/unreleased/sh-clean-up-bitbucket-import-errors.yml
@@ -0,0 +1,5 @@
+---
+title: Avoid storing backtraces from Bitbucket Cloud imports in the database
+merge_request: 29862
+author:
+type: performance
diff --git a/changelogs/unreleased/sh-default-visibility-fix.yml b/changelogs/unreleased/sh-default-visibility-fix.yml
deleted file mode 100644
index 8308f310150..00000000000
--- a/changelogs/unreleased/sh-default-visibility-fix.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Set project default visibility to max allowed
-merge_request: 28754
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-enable-ref-name-caching-discussions.yml b/changelogs/unreleased/sh-enable-ref-name-caching-discussions.yml
new file mode 100644
index 00000000000..12f4a5a499d
--- /dev/null
+++ b/changelogs/unreleased/sh-enable-ref-name-caching-discussions.yml
@@ -0,0 +1,5 @@
+---
+title: Enable Gitaly ref name caching for discussions.json
+merge_request: 29951
+author:
+type: performance
diff --git a/changelogs/unreleased/sh-fix-fogbugz-import.yml b/changelogs/unreleased/sh-fix-fogbugz-import.yml
deleted file mode 100644
index 1ac730fca24..00000000000
--- a/changelogs/unreleased/sh-fix-fogbugz-import.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix Fogbugz Importer not working
-merge_request: 29383
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-issue-55869.yml b/changelogs/unreleased/sh-fix-issue-55869.yml
deleted file mode 100644
index 7935cffc13b..00000000000
--- a/changelogs/unreleased/sh-fix-issue-55869.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix alignment of resend button in members page
-merge_request: 28202
-author:
-type: other
diff --git a/changelogs/unreleased/sh-fix-issue-63158.yml b/changelogs/unreleased/sh-fix-issue-63158.yml
deleted file mode 100644
index 1a79166b6a2..00000000000
--- a/changelogs/unreleased/sh-fix-issue-63158.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix inability to set visibility_level on project via API
-merge_request: 29578
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-rebase-error-clearing.yml b/changelogs/unreleased/sh-fix-rebase-error-clearing.yml
deleted file mode 100644
index 4f5f2779e7f..00000000000
--- a/changelogs/unreleased/sh-fix-rebase-error-clearing.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Properly clear the merge error upon rebase failure
-merge_request: 28319
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-resolve-button-not-available.yml b/changelogs/unreleased/sh-fix-resolve-button-not-available.yml
deleted file mode 100644
index 85a9007f570..00000000000
--- a/changelogs/unreleased/sh-fix-resolve-button-not-available.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix "Resolve conflicts" button not appearing for some users
-merge_request: 29535
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-tag-push-remote-mirror.yml b/changelogs/unreleased/sh-fix-tag-push-remote-mirror.yml
deleted file mode 100644
index 7f33ab28e3d..00000000000
--- a/changelogs/unreleased/sh-fix-tag-push-remote-mirror.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix remote mirrors not updating after tag push
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-utf-8-encoding-resolve-conflicts.yml b/changelogs/unreleased/sh-fix-utf-8-encoding-resolve-conflicts.yml
deleted file mode 100644
index 31039099788..00000000000
--- a/changelogs/unreleased/sh-fix-utf-8-encoding-resolve-conflicts.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix UTF-8 conversion issues when resolving conflicts
-merge_request: 29453
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-omit-blocked-admins-from-notification.yml b/changelogs/unreleased/sh-omit-blocked-admins-from-notification.yml
deleted file mode 100644
index 82c5505892f..00000000000
--- a/changelogs/unreleased/sh-omit-blocked-admins-from-notification.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Omit blocked admins from repository check e-mails
-merge_request: 29507
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-speed-up-commit-loading.yml b/changelogs/unreleased/sh-speed-up-commit-loading.yml
deleted file mode 100644
index db408708385..00000000000
--- a/changelogs/unreleased/sh-speed-up-commit-loading.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Speed up commit loads by disabling BatchLoader replace_methods
-merge_request: 29633
-author:
-type: performance
diff --git a/changelogs/unreleased/sh-strong-memoize-appearances.yml b/changelogs/unreleased/sh-strong-memoize-appearances.yml
new file mode 100644
index 00000000000..dc4fe1c4d8e
--- /dev/null
+++ b/changelogs/unreleased/sh-strong-memoize-appearances.yml
@@ -0,0 +1,5 @@
+---
+title: Memoize non-existent custom appearances
+merge_request: 29957
+author:
+type: performance
diff --git a/changelogs/unreleased/sh-update-process-mem.yml b/changelogs/unreleased/sh-update-process-mem.yml
deleted file mode 100644
index 51b22fb0f00..00000000000
--- a/changelogs/unreleased/sh-update-process-mem.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update get_process_mem to 0.2.3
-merge_request: 28248
-author:
-type: other
diff --git a/changelogs/unreleased/sh-upgrade-ruby-2-6-3-ce.yml b/changelogs/unreleased/sh-upgrade-ruby-2-6-3-ce.yml
deleted file mode 100644
index 9ad5c9ebb64..00000000000
--- a/changelogs/unreleased/sh-upgrade-ruby-2-6-3-ce.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Upgrade Ruby version to 2.6.3
-merge_request: 28117
-author:
-type: performance
diff --git a/changelogs/unreleased/t1.yml b/changelogs/unreleased/t1.yml
deleted file mode 100644
index 6740375485d..00000000000
--- a/changelogs/unreleased/t1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Set up git client in Jupyter installtion
-merge_request: 28783
-author: Amit Rathi
-type: added
diff --git a/changelogs/unreleased/thomas-nilsson-irfu-gitlab-ce-thomas-nilsson-irfu-master-patch-13137.yml b/changelogs/unreleased/thomas-nilsson-irfu-gitlab-ce-thomas-nilsson-irfu-master-patch-13137.yml
deleted file mode 100644
index 3391fcc9537..00000000000
--- a/changelogs/unreleased/thomas-nilsson-irfu-gitlab-ce-thomas-nilsson-irfu-master-patch-13137.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Allow masking if 8 or more characters in base64.
-merge_request: 29143
-author: thomas-nilsson-irfu
-type: changed
diff --git a/changelogs/unreleased/update-babel-to-7-4-4.yml b/changelogs/unreleased/update-babel-to-7-4-4.yml
deleted file mode 100644
index 0d4b4700bb2..00000000000
--- a/changelogs/unreleased/update-babel-to-7-4-4.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Upgrade babel to 7.4.4
-merge_request: 28437
-author: Takuya Noguchi
-type: other
diff --git a/changelogs/unreleased/update-gitaly-to-v1-42-1.yml b/changelogs/unreleased/update-gitaly-to-v1-42-1.yml
deleted file mode 100644
index ff42bdd9c0b..00000000000
--- a/changelogs/unreleased/update-gitaly-to-v1-42-1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Update Gitaly to v1.42.1"
-merge_request: 28425
-author:
-type: other
diff --git a/changelogs/unreleased/update-gitlab-runner-helm-chart-to-0-5-0.yml b/changelogs/unreleased/update-gitlab-runner-helm-chart-to-0-5-0.yml
deleted file mode 100644
index 494331158fb..00000000000
--- a/changelogs/unreleased/update-gitlab-runner-helm-chart-to-0-5-0.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update GitLab Runner Helm Chart to 0.5.0
-merge_request: 28497
-author:
-type: other
diff --git a/changelogs/unreleased/update-gitlab-runner-helm-chart-to-0-5-1.yml b/changelogs/unreleased/update-gitlab-runner-helm-chart-to-0-5-1.yml
deleted file mode 100644
index dd71aa7d461..00000000000
--- a/changelogs/unreleased/update-gitlab-runner-helm-chart-to-0-5-1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update GitLab Runner Helm Chart to 0.5.1
-merge_request: 28720
-author:
-type: other
diff --git a/changelogs/unreleased/update-gitlab-runner-helm-chart-to-0-5-2.yml b/changelogs/unreleased/update-gitlab-runner-helm-chart-to-0-5-2.yml
deleted file mode 100644
index 9ca6d18c2a8..00000000000
--- a/changelogs/unreleased/update-gitlab-runner-helm-chart-to-0-5-2.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update GitLab Runner Helm Chart to 0.5.2
-merge_request: 29050
-author:
-type: other
diff --git a/changelogs/unreleased/update-gitlab-shell-9-3-0.yml b/changelogs/unreleased/update-gitlab-shell-9-3-0.yml
deleted file mode 100644
index 781ff31c7d8..00000000000
--- a/changelogs/unreleased/update-gitlab-shell-9-3-0.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update to GitLab Shell v9.3.0
-merge_request: 29283
-author:
-type: other
diff --git a/changelogs/unreleased/update-pages.yml b/changelogs/unreleased/update-pages.yml
deleted file mode 100644
index 97a20b6b8fa..00000000000
--- a/changelogs/unreleased/update-pages.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update GitLab Pages to v1.6.0
-merge_request: 29048
-author:
-type: other
diff --git a/changelogs/unreleased/update-pagination-texts.yml b/changelogs/unreleased/update-pagination-texts.yml
new file mode 100644
index 00000000000..6a398e26242
--- /dev/null
+++ b/changelogs/unreleased/update-pagination-texts.yml
@@ -0,0 +1,5 @@
+---
+title: Update pagination prev and next texts
+merge_request: 29911
+author:
+type: other
diff --git a/changelogs/unreleased/update-psd-doc.yml b/changelogs/unreleased/update-psd-doc.yml
deleted file mode 100644
index 38c8d1c0d68..00000000000
--- a/changelogs/unreleased/update-psd-doc.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update project security dashboard documentation
-merge_request: 28681
-author:
-type: changed
diff --git a/changelogs/unreleased/update-smileys-new.yml b/changelogs/unreleased/update-smileys-new.yml
deleted file mode 100644
index 0e3f606c81b..00000000000
--- a/changelogs/unreleased/update-smileys-new.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update new smiley icons, find n replace old names with new ones
-merge_request: 28338
-author: Jarek Ostrowski
-type: changed
diff --git a/changelogs/unreleased/upgrade-pages-to-v1-6-1.yml b/changelogs/unreleased/upgrade-pages-to-v1-6-1.yml
deleted file mode 100644
index 0ab58bb50d8..00000000000
--- a/changelogs/unreleased/upgrade-pages-to-v1-6-1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update GitLab Pages to v1.6.1
-merge_request: 29559
-author:
-type: other
diff --git a/changelogs/unreleased/variables-boolean-type.yml b/changelogs/unreleased/variables-boolean-type.yml
deleted file mode 100644
index 7776657f60a..00000000000
--- a/changelogs/unreleased/variables-boolean-type.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'API: change masked attribute type to Boolean'
-merge_request: 28758
-author:
-type: other
diff --git a/changelogs/unreleased/visual-review-apps-fix-dropdown.yml b/changelogs/unreleased/visual-review-apps-fix-dropdown.yml
deleted file mode 100644
index ade68c26df9..00000000000
--- a/changelogs/unreleased/visual-review-apps-fix-dropdown.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Move Dropdown to Stick to MR View App Button
-merge_request: 29767
-author:
-type: fixed
diff --git a/changelogs/unreleased/weimeng-email-routing.yml b/changelogs/unreleased/weimeng-email-routing.yml
deleted file mode 100644
index 6536433bd03..00000000000
--- a/changelogs/unreleased/weimeng-email-routing.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add ability to define notification email addresses for groups you belong to.
-merge_request: 25299
-author:
-type: added
diff --git a/changelogs/unreleased/winh-notes-error-handling.yml b/changelogs/unreleased/winh-notes-error-handling.yml
deleted file mode 100644
index 6f23dd459d4..00000000000
--- a/changelogs/unreleased/winh-notes-error-handling.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Handle errors in successful notes reply
-merge_request: 28082
-author:
-type: fixed
diff --git a/changelogs/unreleased/zj-remove-delta-island-feature-flag.yml b/changelogs/unreleased/zj-remove-delta-island-feature-flag.yml
deleted file mode 100644
index e752e01b701..00000000000
--- a/changelogs/unreleased/zj-remove-delta-island-feature-flag.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-merge_request: 28871
-title: Improve clone performance by using delta islands
-type: performance
diff --git a/changelogs/unreleased/zj-usage-ping-pool-repository.yml b/changelogs/unreleased/zj-usage-ping-pool-repository.yml
deleted file mode 100644
index 62044a933d0..00000000000
--- a/changelogs/unreleased/zj-usage-ping-pool-repository.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add Pool repository to the usage ping
-merge_request: 28267
-author:
-type: other
diff --git a/doc/administration/high_availability/README.md b/doc/administration/high_availability/README.md
index d9c80b1ec59..0c4f926c579 100644
--- a/doc/administration/high_availability/README.md
+++ b/doc/administration/high_availability/README.md
@@ -65,6 +65,7 @@ larger one.
- 1 Redis node
- 1 NFS/Gitaly storage server
- 2 or more GitLab application nodes (Unicorn, Workhorse, Sidekiq)
+- 1 Monitoring node (Prometheus, Grafana)
#### Installation Instructions
@@ -76,6 +77,7 @@ you can continue with the next step.
1. [Redis](redis.md#redis-in-a-scaled-environment)
1. [Gitaly](gitaly.md) (recommended) or [NFS](nfs.md)
1. [GitLab application nodes](gitlab.md)
+1. [Monitoring node (Prometheus and Grafana)](monitoring_node.md)
### Full Scaling
@@ -90,6 +92,7 @@ in size, indicating that there is contention or not enough resources.
- 2 or more NFS/Gitaly storage servers
- 2 or more Sidekiq nodes
- 2 or more GitLab application nodes (Unicorn, Workhorse)
+- 1 Monitoring node (Prometheus, Grafana)
## High Availability Architecture Examples
@@ -133,6 +136,7 @@ the contention.
- 3 Consul/Sentinel nodes
- 2 or more GitLab application nodes (Unicorn, Workhorse, Sidekiq, PGBouncer)
- 1 NFS/Gitaly server
+- 1 Monitoring node (Prometheus, Grafana)
![Horizontal architecture diagram](img/horizontal.png)
@@ -192,6 +196,7 @@ with the added complexity of many more nodes to configure, manage and monitor.
- 2 or more API nodes (All requests to `/api`)
- 2 or more Web nodes (All other web requests)
- 2 or more NFS/Gitaly servers
+- 1 Monitoring node (Prometheus, Grafana)
![Fully Distributed architecture diagram](img/fully-distributed.png)
@@ -205,4 +210,5 @@ separately:
1. [NFS Client and Host setup](nfs_host_client_setup.md)
1. [Configure the GitLab application servers](gitlab.md)
1. [Configure the load balancers](load_balancer.md)
+1. [Monitoring node (Prometheus and Grafana)](monitoring_node.md)
diff --git a/doc/administration/high_availability/database.md b/doc/administration/high_availability/database.md
index 2c051b660ee..4db53353218 100644
--- a/doc/administration/high_availability/database.md
+++ b/doc/administration/high_availability/database.md
@@ -82,7 +82,8 @@ deploy the bundled PostgreSQL.
1. Note the PostgreSQL node's IP address or hostname, port, and
plain text password. These will be necessary when configuring the GitLab
application servers later.
-
+1. [Enable monitoring](#enable-monitoring)
+
Advanced configuration options are supported and can be added if
needed.
@@ -399,6 +400,7 @@ check the [Troubleshooting section](#troubleshooting) before proceeding.
```
1. [Reconfigure GitLab] for the changes to take effect.
+1. [Enable Monitoring](#enable-monitoring)
> Please note:
>
@@ -1086,6 +1088,25 @@ the previous section:
the `gitlab` database user
1. [Reconfigure GitLab] for the changes to take effect
+## Enable Monitoring
+
+> [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/issues/3786) in GitLab 12.0.
+
+If you enable Monitoring, it must be enabled on **all** database servers.
+
+1. Create/edit `/etc/gitlab/gitlab.rb` and add the following configuration:
+
+ ```ruby
+ # Enable service discovery for Prometheus
+ consul['monitoring_service_discovery'] = true
+
+ # Set the network addresses that the exporters will listen on
+ node_exporter['listen_address'] = '0.0.0.0:9100'
+ postgres_exporter['listen_address'] = '0.0.0.0:9187'
+ ```
+
+1. Run `sudo gitlab-ctl reconfigure` to compile the configuration.
+
## Troubleshooting
#### Consul and PostgreSQL changes not taking effect.
diff --git a/doc/administration/high_availability/gitaly.md b/doc/administration/high_availability/gitaly.md
index 1d8e6c999cb..90e5f71d835 100644
--- a/doc/administration/high_availability/gitaly.md
+++ b/doc/administration/high_availability/gitaly.md
@@ -19,3 +19,28 @@ Continue configuration of other components by going back to:
- [Scaled Architectures](README.md#scalable-architecture-examples)
- [High Availability Architectures](README.md#high-availability-architecture-examples)
+
+## Enable Monitoring
+
+> [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/issues/3786) in GitLab 12.0.
+
+ 1. Create/edit `/etc/gitlab/gitlab.rb` and add the following configuration:
+
+ ```ruby
+ # Enable service discovery for Prometheus
+ consul['enable'] = true
+ consul['monitoring_service_discovery'] = true
+
+ # Replace placeholders
+ # Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z
+ # with the addresses of the Consul server nodes
+ consul['configuration'] = {
+ retry_join: %w(Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z),
+ }
+
+ # Set the network addresses that the exporters will listen on
+ node_exporter['listen_address'] = '0.0.0.0:9100'
+ gitaly['prometheus_listen_addr'] = "0.0.0.0:9236"
+ ```
+
+ 1. Run `sudo gitlab-ctl reconfigure` to compile the configuration.
diff --git a/doc/administration/high_availability/gitlab.md b/doc/administration/high_availability/gitlab.md
index 7e3ff741071..0e655e49922 100644
--- a/doc/administration/high_availability/gitlab.md
+++ b/doc/administration/high_availability/gitlab.md
@@ -76,6 +76,8 @@
registry['gid'] = 9002
```
+1. [Enable monitoring](#enable-monitoring)
+
> **Note:** To maintain uniformity of links across HA clusters, the `external_url`
on the first application server as well as the additional application
servers should point to the external url that users will use to access GitLab.
@@ -88,7 +90,8 @@
[Nginx documentation](https://docs.gitlab.com/omnibus/settings/nginx.html#enable-https)
for more information.
>
- > **Note:** It is best to set the `uid` and `gid`s prior to the initial reconfigure of GitLab. Omnibus will not recursively `chown` directories if set after the initial reconfigure.
+ > **Note:** It is best to set the `uid` and `gid`s prior to the initial reconfigure
+ of GitLab. Omnibus will not recursively `chown` directories if set after the initial reconfigure.
## First GitLab application server
@@ -129,6 +132,46 @@ need some extra configuration.
1. Run `sudo gitlab-ctl reconfigure` to compile the configuration.
+## Enable Monitoring
+
+> [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/issues/3786) in GitLab 12.0.
+
+If you enable Monitoring, it must be enabled on **all** GitLab servers.
+
+1. Create/edit `/etc/gitlab/gitlab.rb` and add the following configuration:
+
+ ```ruby
+ # Enable service discovery for Prometheus
+ consul['enable'] = true
+ consul['monitoring_service_discovery'] = true
+
+ # Replace placeholders
+ # Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z
+ # with the addresses of the Consul server nodes
+ consul['configuration'] = {
+ retry_join: %w(Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z),
+ }
+
+ # Set the network addresses that the exporters will listen on
+ node_exporter['listen_address'] = '0.0.0.0:9100'
+ gitlab_workhorse['prometheus_listen_addr'] = '0.0.0.0:9229'
+ sidekiq['listen_address'] = "0.0.0.0"
+ unicorn['listen'] = '0.0.0.0'
+
+ # Add the monitoring node's IP address to the monitoring whitelist and allow it to scrape the NGINX metrics
+ # Replace placeholder
+ # monitoring.gitlab.example.com
+ # with the addresses gathered for the monitoring node
+ gitlab_rails['monitoring_whitelist'] = ['monitoring.gitlab.example.com']
+ nginx['status']['options']['allow'] = ['monitoring.gitlab.example.com']
+ ```
+
+1. Run `sudo gitlab-ctl reconfigure` to compile the configuration.
+
+> **Warning:** After changing `unicorn['listen']` in `gitlab.rb`, and running `sudo gitlab-ctl reconfigure`,
+ it can take an extended period of time for unicorn to complete reloading after receiving a `HUP`.
+ For more information, see the [issue](https://gitlab.com/gitlab-org/omnibus-gitlab/issues/4401).
+
## Troubleshooting
- `mount: wrong fs type, bad option, bad superblock on`
diff --git a/doc/administration/high_availability/monitoring_node.md b/doc/administration/high_availability/monitoring_node.md
new file mode 100644
index 00000000000..d16bf7dc0f0
--- /dev/null
+++ b/doc/administration/high_availability/monitoring_node.md
@@ -0,0 +1,67 @@
+# Configuring a Monitoring node for Scaling and High Availability
+
+> [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/issues/3786) in GitLab 12.0.
+
+## Standalone Monitoring node using GitLab Omnibus
+
+The GitLab Omnibus package can be used to configure a standalone Monitoring node running Prometheus and Grafana.
+The monitoring node is not highly available. See [Scaling and High Availability](README.md)
+for an overview of GitLab scaling and high availability options.
+
+The steps below are the minimum necessary to configure a Monitoring node running Prometheus and Grafana with
+Omnibus:
+
+1. SSH into the Monitoring node.
+1. [Download/install](https://about.gitlab.com/installation) the Omnibus GitLab
+ package you want using **steps 1 and 2** from the GitLab downloads page.
+ - Do not complete any other steps on the download page.
+
+1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
+
+ ```ruby
+ external_url 'http://gitlab.example.com'
+
+ # Enable Prometheus
+ prometheus['enable'] = true
+ prometheus['listen_address'] = '0.0.0.0:9090'
+ prometheus['monitor_kubernetes'] = false
+
+ # Enable Grafana
+ grafana['enable'] = true
+ grafana['admin_password'] = 'toomanysecrets'
+
+ # Enable service discovery for Prometheus
+ consul['enable'] = true
+ consul['monitoring_service_discovery'] = true
+
+ # Replace placeholders
+ # Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z
+ # with the addresses of the Consul server nodes
+ consul['configuration'] = {
+ retry_join: %w(Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z),
+ }
+
+ # Disable all other services
+ gitlab_rails['auto_migrate'] = false
+ alertmanager['enable'] = false
+ gitaly['enable'] = false
+ gitlab_monitor['enable'] = false
+ gitlab_workhorse['enable'] = false
+ nginx['enable'] = true
+ postgres_exporter['enable'] = false
+ postgresql['enable'] = false
+ redis['enable'] = false
+ redis_exporter['enable'] = false
+ sidekiq['enable'] = false
+ unicorn['enable'] = false
+ node_exporter['enable'] = false
+ ```
+
+1. Run `sudo gitlab-ctl reconfigure` to compile the configuration.
+
+## Migrating to Service Discovery
+
+Once monitoring using Service Discovery is enabled with `consul['monitoring_service_discovery'] = true`,
+ensure that `prometheus['scrape_configs']` is not set in `/etc/gitlab/gitlab.rb`. Setting both
+`consul['monitoring_service_discovery'] = true` and `prometheus['scrape_configs']` in `/etc/gitlab/gitlab.rb`
+will result in errors.
diff --git a/doc/administration/high_availability/redis.md b/doc/administration/high_availability/redis.md
index 1aaa709fc8f..f61a8834af3 100644
--- a/doc/administration/high_availability/redis.md
+++ b/doc/administration/high_availability/redis.md
@@ -74,6 +74,7 @@ Omnibus:
1. Note the Redis node's IP address or hostname, port, and
Redis password. These will be necessary when configuring the GitLab
application servers later.
+1. [Enable Monitoring](#enable-monitoring)
Advanced configuration options are supported and can be added if
needed.
@@ -749,6 +750,33 @@ gitlab_rails['redis_sentinels'] = [
[Reconfigure Omnibus GitLab][reconfigure] for the changes to take effect.
+## Enable Monitoring
+
+> [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/issues/3786) in GitLab 12.0.
+
+ If you enable Monitoring, it must be enabled on **all** Redis servers.
+
+ 1. Create/edit `/etc/gitlab/gitlab.rb` and add the following configuration:
+
+ ```ruby
+ # Enable service discovery for Prometheus
+ consul['enable'] = true
+ consul['monitoring_service_discovery'] = true
+
+ # Replace placeholders
+ # Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z
+ # with the addresses of the Consul server nodes
+ consul['configuration'] = {
+ retry_join: %w(Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z),
+ }
+
+ # Set the network addresses that the exporters will listen on
+ node_exporter['listen_address'] = '0.0.0.0:9100'
+ redis_exporter['listen_address'] = '0.0.0.0:9121'
+ ```
+
+ 1. Run `sudo gitlab-ctl reconfigure` to compile the configuration.
+
## Advanced configuration
Omnibus GitLab configures some things behind the curtains to make the sysadmins'
diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md
index df455857dee..c8c92002be2 100644
--- a/doc/ci/variables/README.md
+++ b/doc/ci/variables/README.md
@@ -27,8 +27,7 @@ CI/CD's pipelines. Using variables means no hardcoded values.
### Predefined environment variables
-GitLab CI/CD has a default set of
-[predefined variables](predefined_variables.md)
+GitLab CI/CD has a [default set of predefined variables](predefined_variables.md)
which can be used without any specification needed.
You can call issues numbers, user names, branch names,
pipeline and commit IDs, and much more.
@@ -36,7 +35,7 @@ pipeline and commit IDs, and much more.
Predefined environment variables are the ones that GitLab
provides out of the box for the local environment of the Runner.
-GitLab reads the .gitlab-ci.yml file, sends the information
+GitLab reads the `.gitlab-ci.yml` file, sends the information
to the Runner (which runs the script commands), under which
the variables are exposed.
@@ -44,6 +43,9 @@ For example, two jobs under the same pipeline can share the same
`CI_PIPELINE_ID` variable, but each one has its own `CI_JOB_ID`
variable.
+NOTE: **Note:**
+Find here the full [**predefined variables reference table**](predefined_variables.md).
+
### Custom environment variables
When your use case requires a specific variable, you can
@@ -480,7 +482,7 @@ Below you can find supported syntax reference:
> Example: `$VARIABLE == "some value"`
- > Example: `$VARIABLE != "some value"` _(added in 11.11)_
+ > Example: `$VARIABLE != "some value"` (introduced in GitLab 11.11)
You can use equality operator `==` or `!=` to compare a variable content to a
string. We support both, double quotes and single quotes to define a string
@@ -491,7 +493,7 @@ Below you can find supported syntax reference:
> Example: `$VARIABLE == null`
- > Example: `$VARIABLE != null` _(added in 11.11)_
+ > Example: `$VARIABLE != null` (introduced in GitLab 11.11)
It sometimes happens that you want to check whether a variable is defined
or not. To do that, you can compare a variable to `null` keyword, like
@@ -502,7 +504,7 @@ Below you can find supported syntax reference:
> Example: `$VARIABLE == ""`
- > Example: `$VARIABLE != ""` _(added in 11.11)_
+ > Example: `$VARIABLE != ""` (introduced in GitLab 11.11)
If you want to check whether a variable is defined, but is empty, you can
simply compare it against an empty string, like `$VAR == ''` or non-empty
@@ -512,7 +514,7 @@ Below you can find supported syntax reference:
> Example: `$VARIABLE_1 == $VARIABLE_2`
- > Example: `$VARIABLE_1 != $VARIABLE_2` _(added in 11.11)_
+ > Example: `$VARIABLE_1 != $VARIABLE_2` (introduced in GitLab 11.11)
It is possible to compare two variables. This is going to compare values
of these variables.
@@ -528,11 +530,11 @@ Below you can find supported syntax reference:
`$STAGING` value needs to a string, with length higher than zero.
Variable that contains only whitespace characters is not an empty variable.
-1. Pattern matching _(added in 11.0)_
+1. Pattern matching (introduced in GitLab 11.0)
> Example: `$VARIABLE =~ /^content.*/`
- > Example: `$VARIABLE_1 !~ /^content.*/` _(added in 11.11)_
+ > Example: `$VARIABLE_1 !~ /^content.*/` (introduced in GitLab 11.11)
It is possible perform pattern matching against a variable and regular
expression. Expression like this evaluates to truth if matches are found
@@ -541,7 +543,7 @@ Below you can find supported syntax reference:
Pattern matching is case-sensitive by default. Use `i` flag modifier, like
`/pattern/i` to make a pattern case-insensitive.
-1. Conjunction / Disjunction
+1. Conjunction / Disjunction ([introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/27925) in GitLab 12.0)
> Example: `$VARIABLE1 =~ /^content.*/ && $VARIABLE2 == "something"`
diff --git a/doc/user/application_security/dependency_scanning/index.md b/doc/user/application_security/dependency_scanning/index.md
index 34d4507210e..a4e5b19bdc7 100644
--- a/doc/user/application_security/dependency_scanning/index.md
+++ b/doc/user/application_security/dependency_scanning/index.md
@@ -346,7 +346,7 @@ the report JSON unless stated otherwise. Presence of optional fields depends on
| `vulnerabilities[].scanner` | A node that describes the analyzer used to find this vulnerability. |
| `vulnerabilities[].scanner.id` | Id of the scanner as a snake_case string. |
| `vulnerabilities[].scanner.name` | Name of the scanner, for display purposes. |
-| `vulnerabilities[].location` | A node that tells where the vulnerability is located. |
+| `vulnerabilities[].location` | A node that tells where the vulnerability is located. |
| `vulnerabilities[].location.file` | Path to the dependencies file (e.g., `yarn.lock`). Optional. |
| `vulnerabilities[].location.dependency` | A node that describes the dependency of a project where the vulnerability is located. |
| `vulnerabilities[].location.dependency.package` | A node that provides the information on the package where the vulnerability is located. |
@@ -379,17 +379,17 @@ Once a vulnerability is found, you can interact with it. Read more on how to
## Dependency List
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/10075)
-in [GitLab Ultimate](https://about.gitlab.com/pricing/) 12.0.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/10075) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 12.0.
-An additional benefit of Dependency Scanning is the ability to get a list of your project's dependencies with their versions.
+An additional benefit of Dependency Scanning is the ability to get a list of your
+project's dependencies with their versions. This list can be generated only for
+[languages and package managers](#supported-languages-and-package-managers)
+supported by Gemnasium.
-This list can be generated only for [languages and package managers](#supported-languages-and-package-managers) supported by [Gemnasium](https://gitlab.com/gitlab-org/security-products/gemnasium/general).
-
-To see the generated dependency list, navigate to the Dependency List page under your project's left sidebar menu **Project > Dependency List**.
+To see the generated dependency list, navigate to your project's **Project > Dependency List**.
## Contributing to the vulnerability database
You can search the [gemnasium-db](https://gitlab.com/gitlab-org/security-products/gemnasium-db) project
to find a vulnerability in the Gemnasium database.
-You can also [submit new vulnerabilities](https://gitlab.com/gitlab-org/security-products/gemnasium-db/blob/master/CONTRIBUTING.md). \ No newline at end of file
+You can also [submit new vulnerabilities](https://gitlab.com/gitlab-org/security-products/gemnasium-db/blob/master/CONTRIBUTING.md).
diff --git a/doc/user/group/index.md b/doc/user/group/index.md
index abd95eddf63..4fde45da6c4 100644
--- a/doc/user/group/index.md
+++ b/doc/user/group/index.md
@@ -268,9 +268,10 @@ be unique.
To change your group path:
-1. Navigate to your group's **Settings > General**.
-1. Enter a new name under **Group path**.
-1. Click **Save group**.
+1. Navigate to your group's **Settings > General** page.
+1. Expand the **Path, transfer, remove** section.
+1. Enter a new name under **Change group path**.
+1. Click **Change group path**.
CAUTION: **Caution:**
It is currently not possible to rename a namespace if it contains a
diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md
index 547a0c36108..a0fe97f2b9d 100644
--- a/doc/user/project/clusters/index.md
+++ b/doc/user/project/clusters/index.md
@@ -520,9 +520,7 @@ service account of the cluster integration.
### Troubleshooting failed deployment jobs
GitLab will create a namespace and service account specifically for your
-deployment jobs. On project level clusters, this happens when the cluster
-is created. On group level clusters, resources are created immediately
-before the deployment job starts.
+deployment jobs. This happens immediately before the deployment job starts.
However, sometimes GitLab can not create them. In such instances, your job will fail with the message:
diff --git a/doc/user/project/deploy_boards.md b/doc/user/project/deploy_boards.md
index 2aef369c087..175384bc985 100644
--- a/doc/user/project/deploy_boards.md
+++ b/doc/user/project/deploy_boards.md
@@ -88,7 +88,10 @@ To display the Deploy Boards for a specific [environment] you should:
Kubernetes.
NOTE: **Note:**
- Matching based on the Kubernetes `app` label was removed in [GitLab 12.1](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14020)
+ Matching based on the Kubernetes `app` label was removed in [GitLab
+ 12.1](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14020).
+ To migrate, please apply the required annotations (see above) and
+ re-deploy your application.
![Deploy Boards Kubernetes Label](img/deploy_boards_kubernetes_label.png)
diff --git a/lib/gitlab/bitbucket_import/importer.rb b/lib/gitlab/bitbucket_import/importer.rb
index c9f0ed66a54..8047ef4fa15 100644
--- a/lib/gitlab/bitbucket_import/importer.rb
+++ b/lib/gitlab/bitbucket_import/importer.rb
@@ -11,6 +11,7 @@ module Gitlab
{ title: 'task', color: '#7F8C8D' }].freeze
attr_reader :project, :client, :errors, :users
+ attr_accessor :logger
def initialize(project)
@project = project
@@ -19,6 +20,7 @@ module Gitlab
@labels = {}
@errors = []
@users = {}
+ @logger = Gitlab::Import::Logger.build
end
def execute
@@ -41,6 +43,18 @@ module Gitlab
}.to_json)
end
+ def store_pull_request_error(pull_request, ex)
+ backtrace = Gitlab::Profiler.clean_backtrace(ex.backtrace)
+ error = { type: :pull_request, iid: pull_request.iid, errors: ex.message, trace: backtrace, raw_response: pull_request.raw }
+
+ log_error(error)
+ # Omit the details from the database to avoid blowing up usage in the error column
+ error.delete(:trace)
+ error.delete(:raw_response)
+
+ errors << error
+ end
+
def gitlab_user_id(project, username)
find_user_id(username) || project.creator_id
end
@@ -176,7 +190,7 @@ module Gitlab
import_pull_request_comments(pull_request, merge_request) if merge_request.persisted?
rescue StandardError => e
- errors << { type: :pull_request, iid: pull_request.iid, errors: e.message, trace: e.backtrace.join("\n"), raw_response: pull_request.raw }
+ store_pull_request_error(pull_request, e)
end
end
@@ -254,6 +268,18 @@ module Gitlab
updated_at: comment.updated_at
}
end
+
+ def log_error(details)
+ logger.error(log_base_data.merge(details))
+ end
+
+ def log_base_data
+ {
+ class: self.class.name,
+ project_id: project.id,
+ project_path: project.full_path
+ }
+ end
end
end
end
diff --git a/lib/gitlab/ci/build/prerequisite/kubernetes_namespace.rb b/lib/gitlab/ci/build/prerequisite/kubernetes_namespace.rb
index 531c9ce4256..e6e0aaab60b 100644
--- a/lib/gitlab/ci/build/prerequisite/kubernetes_namespace.rb
+++ b/lib/gitlab/ci/build/prerequisite/kubernetes_namespace.rb
@@ -8,7 +8,6 @@ module Gitlab
def unmet?
deployment_cluster.present? &&
deployment_cluster.managed? &&
- !deployment_cluster.project_type? &&
(kubernetes_namespace.new_record? || kubernetes_namespace.service_account_token.blank?)
end
diff --git a/lib/gitlab/json_cache.rb b/lib/gitlab/json_cache.rb
index 9a0b2b35112..d01183d7845 100644
--- a/lib/gitlab/json_cache.rb
+++ b/lib/gitlab/json_cache.rb
@@ -22,10 +22,10 @@ module Gitlab
expanded_cache_key = [namespace, key].compact
if cache_key_with_version
- expanded_cache_key << Rails.version
+ expanded_cache_key << [Gitlab::VERSION, Rails.version]
end
- expanded_cache_key.join(':')
+ expanded_cache_key.flatten.join(':').freeze
end
def expire(key)
diff --git a/lib/gitlab/kubernetes.rb b/lib/gitlab/kubernetes.rb
index 1103a4eed1d..22bd00751bc 100644
--- a/lib/gitlab/kubernetes.rb
+++ b/lib/gitlab/kubernetes.rb
@@ -43,6 +43,14 @@ module Gitlab
})
end
+ def filter_by_legacy_label(items, app, env)
+ legacy_items = filter_by_label(items, { app: env })
+
+ non_legacy_items = filter_by_project_environment(legacy_items, app, env)
+
+ legacy_items - non_legacy_items
+ end
+
# Converts a pod (as returned by the kubernetes API) into a terminal
def terminals_for_pod(api_url, namespace, pod)
metadata = pod.fetch("metadata", {})
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index eb76e62c9f5..b04cb999dc3 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -2849,10 +2849,13 @@ msgstr ""
msgid "ContainerRegistry|Once you log in, you&rsquo;re free to create and upload a container image using the common %{build} and %{push} commands"
msgstr ""
-msgid "ContainerRegistry|Remove repository"
+msgid "ContainerRegistry|Remove image"
msgstr ""
-msgid "ContainerRegistry|Remove tag"
+msgid "ContainerRegistry|Remove image and tags"
+msgstr ""
+
+msgid "ContainerRegistry|Remove repository"
msgstr ""
msgid "ContainerRegistry|Size"
@@ -2870,6 +2873,12 @@ msgstr ""
msgid "ContainerRegistry|With the Docker Container Registry integrated into GitLab, every project can have its own space to store its Docker images."
msgstr ""
+msgid "ContainerRegistry|You are about to delete the image <b>%{title}</b>. This will delete the image and all tags pointing to this image."
+msgstr ""
+
+msgid "ContainerRegistry|You are about to remove repository <b>%{title}</b>. Once you confirm, this repository will be permanently deleted."
+msgstr ""
+
msgid "ContainerRegistry|You can also use a %{deploy_token} for read-only access to the registry images."
msgstr ""
@@ -6934,13 +6943,13 @@ msgstr ""
msgid "Pagination|Last »"
msgstr ""
-msgid "Pagination|Next"
+msgid "Pagination|Next ›"
msgstr ""
-msgid "Pagination|Prev"
+msgid "Pagination|« First"
msgstr ""
-msgid "Pagination|« First"
+msgid "Pagination|‹ Prev"
msgstr ""
msgid "Parameter"
diff --git a/package.json b/package.json
index 38b07610296..54998cc81dd 100644
--- a/package.json
+++ b/package.json
@@ -191,7 +191,7 @@
"nodemon": "^1.18.9",
"pixelmatch": "^4.0.2",
"postcss": "^7.0.14",
- "prettier": "1.16.4",
+ "prettier": "1.18.2",
"stylelint": "^9.10.1",
"stylelint-config-recommended": "^2.1.0",
"stylelint-scss": "^3.5.4",
diff --git a/spec/controllers/projects/clusters_controller_spec.rb b/spec/controllers/projects/clusters_controller_spec.rb
index fa49438287f..35cbab57037 100644
--- a/spec/controllers/projects/clusters_controller_spec.rb
+++ b/spec/controllers/projects/clusters_controller_spec.rb
@@ -340,7 +340,6 @@ describe Projects::ClustersController do
describe 'security' do
before do
- allow(ClusterConfigureWorker).to receive(:perform_async)
stub_kubeclient_get_namespace('https://kubernetes.example.com', namespace: 'my-namespace')
end
@@ -438,7 +437,6 @@ describe Projects::ClustersController do
end
before do
- allow(ClusterConfigureWorker).to receive(:perform_async)
stub_kubeclient_get_namespace('https://kubernetes.example.com', namespace: 'my-namespace')
end
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index 34cbf0c8723..0eca663a683 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -1001,6 +1001,8 @@ describe Projects::MergeRequestsController do
before do
project.add_developer(user)
sign_in(user)
+
+ expect(::Gitlab::GitalyClient).to receive(:allow_ref_name_caching).and_call_original
end
it 'returns 200' do
diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb
index 29545779a34..dafec29dfcc 100644
--- a/spec/features/admin/admin_users_spec.rb
+++ b/spec/features/admin/admin_users_spec.rb
@@ -419,6 +419,32 @@ describe "Admin::Users" do
end
end
end
+
+ describe 'Email verification status' do
+ let!(:secondary_email) do
+ create :email, email: 'secondary@example.com', user: user
+ end
+
+ it 'displays the correct status for an unverified email address' do
+ user.update(confirmed_at: nil, unconfirmed_email: user.email)
+ visit admin_user_path(user)
+
+ expect(page).to have_content("#{user.email} Unverified")
+
+ expect(page).to have_content("#{secondary_email.email} Unverified")
+ end
+
+ it 'displays the correct status for a verified email address' do
+ visit admin_user_path(user)
+ expect(page).to have_content("#{user.email} Verified")
+
+ secondary_email.confirm
+ expect(secondary_email.confirmed?).to be_truthy
+
+ visit admin_user_path(user)
+ expect(page).to have_content("#{secondary_email.email} Verified")
+ end
+ end
end
describe "GET /admin/users/:id/edit" do
diff --git a/spec/features/container_registry_spec.rb b/spec/features/container_registry_spec.rb
index 6f9901815e1..21d97aba0c5 100644
--- a/spec/features/container_registry_spec.rb
+++ b/spec/features/container_registry_spec.rb
@@ -42,6 +42,8 @@ describe "Container Registry", :js do
.to receive(:delete_tags!).and_return(true)
click_on(class: 'js-remove-repo')
+ expect(find('.modal .modal-title')).to have_content 'Remove repository'
+ find('.modal .modal-footer .btn-danger').click
end
it 'user removes a specific tag from container repository' do
@@ -54,6 +56,8 @@ describe "Container Registry", :js do
.to receive(:delete).and_return(true)
click_on(class: 'js-delete-registry')
+ expect(find('.modal .modal-title')).to have_content 'Remove image'
+ find('.modal .modal-footer .btn-danger').click
end
end
diff --git a/spec/features/projects/clusters/gcp_spec.rb b/spec/features/projects/clusters/gcp_spec.rb
index e4a3a1a8c92..974e0f84681 100644
--- a/spec/features/projects/clusters/gcp_spec.rb
+++ b/spec/features/projects/clusters/gcp_spec.rb
@@ -118,7 +118,6 @@ describe 'Gcp Cluster', :js do
context 'when user changes cluster parameters' do
before do
- allow(ClusterConfigureWorker).to receive(:perform_async)
fill_in 'cluster_platform_kubernetes_attributes_namespace', with: 'my-namespace'
page.within('#js-cluster-details') { click_button 'Save changes' }
end
diff --git a/spec/helpers/appearances_helper_spec.rb b/spec/helpers/appearances_helper_spec.rb
index a3511e078ce..ed3e31b3c53 100644
--- a/spec/helpers/appearances_helper_spec.rb
+++ b/spec/helpers/appearances_helper_spec.rb
@@ -8,6 +8,22 @@ describe AppearancesHelper do
allow(helper).to receive(:current_user).and_return(user)
end
+ describe '.current_appearance' do
+ it 'memoizes empty appearance' do
+ expect(Appearance).to receive(:current).once
+
+ 2.times { helper.current_appearance }
+ end
+
+ it 'memoizes custom appearance' do
+ create(:appearance)
+
+ expect(Appearance).to receive(:current).once.and_call_original
+
+ 2.times { helper.current_appearance }
+ end
+ end
+
describe '#header_message' do
it 'returns nil when header message field is not set' do
create(:appearance)
diff --git a/spec/javascripts/jobs/components/stages_dropdown_spec.js b/spec/javascripts/jobs/components/stages_dropdown_spec.js
index 52bb5161123..86b7a8d7848 100644
--- a/spec/javascripts/jobs/components/stages_dropdown_spec.js
+++ b/spec/javascripts/jobs/components/stages_dropdown_spec.js
@@ -101,9 +101,7 @@ describe('Stages Dropdown', () => {
});
it(`renders the pipeline info text like "Pipeline #123 for !456 with source_branch into target_branch"`, () => {
- const expected = `Pipeline #${pipeline.id} for !${pipeline.merge_request.iid} with ${
- pipeline.merge_request.source_branch
- } into ${pipeline.merge_request.target_branch}`;
+ const expected = `Pipeline #${pipeline.id} for !${pipeline.merge_request.iid} with ${pipeline.merge_request.source_branch} into ${pipeline.merge_request.target_branch}`;
const actual = trimText(vm.$el.querySelector('.js-pipeline-info').innerText);
expect(actual).toBe(expected);
@@ -144,9 +142,7 @@ describe('Stages Dropdown', () => {
});
it(`renders the pipeline info like "Pipeline #123 for !456 with source_branch"`, () => {
- const expected = `Pipeline #${pipeline.id} for !${pipeline.merge_request.iid} with ${
- pipeline.merge_request.source_branch
- }`;
+ const expected = `Pipeline #${pipeline.id} for !${pipeline.merge_request.iid} with ${pipeline.merge_request.source_branch}`;
const actual = trimText(vm.$el.querySelector('.js-pipeline-info').innerText);
expect(actual).toBe(expected);
diff --git a/spec/javascripts/pages/labels/components/promote_label_modal_spec.js b/spec/javascripts/pages/labels/components/promote_label_modal_spec.js
index 08a8362797b..75912612255 100644
--- a/spec/javascripts/pages/labels/components/promote_label_modal_spec.js
+++ b/spec/javascripts/pages/labels/components/promote_label_modal_spec.js
@@ -26,9 +26,7 @@ describe('Promote label modal', () => {
it('contains the proper description', () => {
expect(vm.text).toContain(
- `Promoting ${labelMockData.labelTitle} will make it available for all projects inside ${
- labelMockData.groupName
- }`,
+ `Promoting ${labelMockData.labelTitle} will make it available for all projects inside ${labelMockData.groupName}`,
);
});
diff --git a/spec/javascripts/pages/milestones/shared/components/promote_milestone_modal_spec.js b/spec/javascripts/pages/milestones/shared/components/promote_milestone_modal_spec.js
index 2ac73ef3024..3d25a278cef 100644
--- a/spec/javascripts/pages/milestones/shared/components/promote_milestone_modal_spec.js
+++ b/spec/javascripts/pages/milestones/shared/components/promote_milestone_modal_spec.js
@@ -24,9 +24,7 @@ describe('Promote milestone modal', () => {
it('contains the proper description', () => {
expect(vm.text).toContain(
- `Promoting ${
- milestoneMockData.milestoneTitle
- } will make it available for all projects inside ${milestoneMockData.groupName}.`,
+ `Promoting ${milestoneMockData.milestoneTitle} will make it available for all projects inside ${milestoneMockData.groupName}.`,
);
});
diff --git a/spec/javascripts/registry/components/collapsible_container_spec.js b/spec/javascripts/registry/components/collapsible_container_spec.js
index a3f7ff76dc7..9ed4b04324a 100644
--- a/spec/javascripts/registry/components/collapsible_container_spec.js
+++ b/spec/javascripts/registry/components/collapsible_container_spec.js
@@ -12,6 +12,8 @@ describe('collapsible registry container', () => {
let mock;
const Component = Vue.extend(collapsibleComponent);
+ const findDeleteBtn = () => vm.$el.querySelector('.js-remove-repo');
+
beforeEach(() => {
mock = new MockAdapter(axios);
@@ -67,7 +69,25 @@ describe('collapsible registry container', () => {
describe('delete repo', () => {
it('should be possible to delete a repo', () => {
- expect(vm.$el.querySelector('.js-remove-repo')).not.toBeNull();
+ expect(findDeleteBtn()).not.toBeNull();
+ });
+
+ describe('clicked on delete', () => {
+ beforeEach(done => {
+ findDeleteBtn().click();
+ Vue.nextTick(done);
+ });
+
+ it('should open confirmation modal', () => {
+ expect(vm.$el.querySelector('#confirm-repo-deletion-modal')).not.toBeNull();
+ });
+
+ it('should call deleteItem when confirming deletion', () => {
+ spyOn(vm, 'deleteItem').and.returnValue(Promise.resolve());
+ vm.$el.querySelector('#confirm-repo-deletion-modal .btn-danger').click();
+
+ expect(vm.deleteItem).toHaveBeenCalledWith(vm.repo);
+ });
});
});
});
diff --git a/spec/javascripts/registry/components/table_registry_spec.js b/spec/javascripts/registry/components/table_registry_spec.js
index 7f5252a7d6c..d366c67a1b9 100644
--- a/spec/javascripts/registry/components/table_registry_spec.js
+++ b/spec/javascripts/registry/components/table_registry_spec.js
@@ -3,10 +3,14 @@ import tableRegistry from '~/registry/components/table_registry.vue';
import store from '~/registry/stores';
import { repoPropsData } from '../mock_data';
+const [firstImage] = repoPropsData.list;
+
describe('table registry', () => {
let vm;
let Component;
+ const findDeleteBtn = () => vm.$el.querySelector('.js-delete-registry');
+
beforeEach(() => {
Component = Vue.extend(tableRegistry);
vm = new Component({
@@ -37,8 +41,30 @@ describe('table registry', () => {
expect(textRendered).toContain(repoPropsData.list[0].size);
});
- it('should be possible to delete a registry', () => {
- expect(vm.$el.querySelector('.table tbody tr .js-delete-registry')).toBeDefined();
+ describe('delete registry', () => {
+ it('should be possible to delete a registry', () => {
+ expect(findDeleteBtn()).toBeDefined();
+ });
+
+ describe('clicked on delete', () => {
+ beforeEach(done => {
+ findDeleteBtn().click();
+ Vue.nextTick(done);
+ });
+
+ it('should open confirmation modal and set itemToBeDeleted properly', () => {
+ expect(vm.itemToBeDeleted).toEqual(firstImage);
+ expect(vm.$el.querySelector('#confirm-image-deletion-modal')).not.toBeNull();
+ });
+
+ it('should call deleteItem and reset itemToBeDeleted when confirming deletion', () => {
+ spyOn(vm, 'deleteItem').and.returnValue(Promise.resolve());
+ vm.$el.querySelector('#confirm-image-deletion-modal .btn-danger').click();
+
+ expect(vm.deleteItem).toHaveBeenCalledWith(firstImage);
+ expect(vm.itemToBeDeleted).toBeNull();
+ });
+ });
});
describe('pagination', () => {
diff --git a/spec/javascripts/registry/stores/actions_spec.js b/spec/javascripts/registry/stores/actions_spec.js
index c9aa82dba90..0613ec8e0f1 100644
--- a/spec/javascripts/registry/stores/actions_spec.js
+++ b/spec/javascripts/registry/stores/actions_spec.js
@@ -105,4 +105,28 @@ describe('Actions Registry Store', () => {
);
});
});
+
+ describe('deleteItem', () => {
+ it('should perform DELETE request on destroyPath', done => {
+ const destroyPath = `${TEST_HOST}/mygroup/myproject/container_registry/1.json`;
+ let deleted = false;
+ mock.onDelete(destroyPath).replyOnce(() => {
+ deleted = true;
+ return [200];
+ });
+ testAction(
+ actions.deleteItem,
+ {
+ destroyPath,
+ },
+ mockedState,
+ )
+ .then(() => {
+ expect(mock.history.delete.length).toBe(1);
+ expect(deleted).toBe(true);
+ done();
+ })
+ .catch(done.fail);
+ });
+ });
});
diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js b/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js
index 75017d20473..fe831094ecf 100644
--- a/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js
@@ -222,9 +222,7 @@ describe('MRWidgetPipeline', () => {
sourceBranchLink: mockCopy.source_branch_link,
});
- const expected = `Pipeline #${pipeline.id} ${pipeline.details.status.label} for ${
- pipeline.commit.short_id
- } on ${mockCopy.source_branch_link}`;
+ const expected = `Pipeline #${pipeline.id} ${pipeline.details.status.label} for ${pipeline.commit.short_id} on ${mockCopy.source_branch_link}`;
const actual = trimText(vm.$el.querySelector('.js-pipeline-info-container').innerText);
@@ -247,11 +245,7 @@ describe('MRWidgetPipeline', () => {
sourceBranchLink: mockCopy.source_branch_link,
});
- const expected = `Pipeline #${pipeline.id} ${pipeline.details.status.label} for ${
- pipeline.commit.short_id
- } on !${pipeline.merge_request.iid} with ${pipeline.merge_request.source_branch} into ${
- pipeline.merge_request.target_branch
- }`;
+ const expected = `Pipeline #${pipeline.id} ${pipeline.details.status.label} for ${pipeline.commit.short_id} on !${pipeline.merge_request.iid} with ${pipeline.merge_request.source_branch} into ${pipeline.merge_request.target_branch}`;
const actual = trimText(vm.$el.querySelector('.js-pipeline-info-container').innerText);
@@ -274,9 +268,7 @@ describe('MRWidgetPipeline', () => {
sourceBranchLink: mockCopy.source_branch_link,
});
- const expected = `Pipeline #${pipeline.id} ${pipeline.details.status.label} for ${
- pipeline.commit.short_id
- } on !${pipeline.merge_request.iid} with ${pipeline.merge_request.source_branch}`;
+ const expected = `Pipeline #${pipeline.id} ${pipeline.details.status.label} for ${pipeline.commit.short_id} on !${pipeline.merge_request.iid} with ${pipeline.merge_request.source_branch}`;
const actual = trimText(vm.$el.querySelector('.js-pipeline-info-container').innerText);
diff --git a/spec/javascripts/vue_shared/components/table_pagination_spec.js b/spec/javascripts/vue_shared/components/table_pagination_spec.js
index 42abb4d83f0..258530f32f7 100644
--- a/spec/javascripts/vue_shared/components/table_pagination_spec.js
+++ b/spec/javascripts/vue_shared/components/table_pagination_spec.js
@@ -217,7 +217,7 @@ describe('Pagination component', () => {
change: spy,
});
- expect(component.$el.querySelector('.js-next-button').textContent.trim()).toEqual('Next');
+ expect(component.$el.querySelector('.js-next-button').textContent.trim()).toEqual('Next ›');
component.$el.querySelector('.js-next-button .page-link').click();
@@ -237,7 +237,7 @@ describe('Pagination component', () => {
change: spy,
});
- expect(component.$el.querySelector('.js-next-button').textContent.trim()).toEqual('Next');
+ expect(component.$el.querySelector('.js-next-button').textContent.trim()).toEqual('Next ›');
component.$el.querySelector('.js-next-button .page-link').click();
diff --git a/spec/lib/gitlab/bitbucket_import/importer_spec.rb b/spec/lib/gitlab/bitbucket_import/importer_spec.rb
index 2e90f6c7f71..35700e0b588 100644
--- a/spec/lib/gitlab/bitbucket_import/importer_spec.rb
+++ b/spec/lib/gitlab/bitbucket_import/importer_spec.rb
@@ -98,12 +98,8 @@ describe Gitlab::BitbucketImport::Importer do
describe '#import_pull_requests' do
let(:source_branch_sha) { sample.commits.last }
let(:target_branch_sha) { sample.commits.first }
-
- before do
- allow(subject).to receive(:import_wiki)
- allow(subject).to receive(:import_issues)
-
- pull_request = instance_double(
+ let(:pull_request) do
+ instance_double(
Bitbucket::Representation::PullRequest,
iid: 10,
source_branch_sha: source_branch_sha,
@@ -116,6 +112,11 @@ describe Gitlab::BitbucketImport::Importer do
author: 'other',
created_at: Time.now,
updated_at: Time.now)
+ end
+
+ before do
+ allow(subject).to receive(:import_wiki)
+ allow(subject).to receive(:import_issues)
# https://gitlab.com/gitlab-org/gitlab-test/compare/c1acaa58bbcbc3eafe538cb8274ba387047b69f8...5937ac0a7beb003549fc5fd26fc247ad
@inline_note = instance_double(
@@ -167,6 +168,20 @@ describe Gitlab::BitbucketImport::Importer do
expect(reply_note.note).to eq(@reply.note)
end
+ context 'when importing a pull request throws an exception' do
+ before do
+ allow(pull_request).to receive(:raw).and_return('hello world')
+ allow(subject.client).to receive(:pull_request_comments).and_raise(HTTParty::Error)
+ end
+
+ it 'logs an error without the backtrace' do
+ subject.execute
+
+ expect(subject.errors.count).to eq(1)
+ expect(subject.errors.first.keys).to match_array(%i(type iid errors))
+ end
+ end
+
context "when branches' sha is not found in the repository" do
let(:source_branch_sha) { 'a' * Commit::MIN_SHA_LENGTH }
let(:target_branch_sha) { 'b' * Commit::MIN_SHA_LENGTH }
diff --git a/spec/lib/gitlab/ci/build/prerequisite/kubernetes_namespace_spec.rb b/spec/lib/gitlab/ci/build/prerequisite/kubernetes_namespace_spec.rb
index 5ac5122e800..c5bc81a2b9e 100644
--- a/spec/lib/gitlab/ci/build/prerequisite/kubernetes_namespace_spec.rb
+++ b/spec/lib/gitlab/ci/build/prerequisite/kubernetes_namespace_spec.rb
@@ -45,12 +45,6 @@ describe Gitlab::Ci::Build::Prerequisite::KubernetesNamespace do
it { is_expected.to be_truthy }
end
end
-
- context 'and cluster is project type' do
- let(:cluster) { create(:cluster, :project) }
-
- it { is_expected.to be_falsey }
- end
end
context 'and no cluster to deploy to' do
diff --git a/spec/lib/gitlab/json_cache_spec.rb b/spec/lib/gitlab/json_cache_spec.rb
index c6a6042c65c..59160741c45 100644
--- a/spec/lib/gitlab/json_cache_spec.rb
+++ b/spec/lib/gitlab/json_cache_spec.rb
@@ -6,7 +6,7 @@ describe Gitlab::JsonCache do
let(:backend) { double('backend').as_null_object }
let(:namespace) { 'geo' }
let(:key) { 'foo' }
- let(:expanded_key) { "#{namespace}:#{key}:#{Rails.version}" }
+ let(:expanded_key) { "#{namespace}:#{key}:#{Gitlab::VERSION}:#{Rails.version}" }
set(:broadcast_message) { create(:broadcast_message) }
subject(:cache) { described_class.new(namespace: namespace, backend: backend) }
@@ -35,42 +35,68 @@ describe Gitlab::JsonCache do
describe '#cache_key' do
context 'when namespace is not defined' do
- it 'expands out the key with Rails version' do
- cache = described_class.new(cache_key_with_version: true)
+ context 'when cache_key_with_version is true' do
+ it 'expands out the key with GitLab, and Rails versions' do
+ cache = described_class.new(cache_key_with_version: true)
- cache_key = cache.cache_key(key)
+ cache_key = cache.cache_key(key)
- expect(cache_key).to eq("#{key}:#{Rails.version}")
+ expect(cache_key).to eq("#{key}:#{Gitlab::VERSION}:#{Rails.version}")
+ end
end
- end
- context 'when cache_key_with_version is true' do
- it 'expands out the key with namespace and Rails version' do
- cache = described_class.new(namespace: namespace, cache_key_with_version: true)
+ context 'when cache_key_with_version is false' do
+ it 'returns the key' do
+ cache = described_class.new(namespace: nil, cache_key_with_version: false)
- cache_key = cache.cache_key(key)
+ cache_key = cache.cache_key(key)
- expect(cache_key).to eq("#{namespace}:#{key}:#{Rails.version}")
+ expect(cache_key).to eq(key)
+ end
end
end
- context 'when cache_key_with_version is false' do
- it 'expands out the key with namespace' do
- cache = described_class.new(namespace: namespace, cache_key_with_version: false)
+ context 'when namespace is nil' do
+ context 'when cache_key_with_version is true' do
+ it 'expands out the key with GitLab, and Rails versions' do
+ cache = described_class.new(cache_key_with_version: true)
- cache_key = cache.cache_key(key)
+ cache_key = cache.cache_key(key)
- expect(cache_key).to eq("#{namespace}:#{key}")
+ expect(cache_key).to eq("#{key}:#{Gitlab::VERSION}:#{Rails.version}")
+ end
+ end
+
+ context 'when cache_key_with_version is false' do
+ it 'returns the key' do
+ cache = described_class.new(namespace: nil, cache_key_with_version: false)
+
+ cache_key = cache.cache_key(key)
+
+ expect(cache_key).to eq(key)
+ end
end
end
- context 'when namespace is nil, and cache_key_with_version is false' do
- it 'returns the key' do
- cache = described_class.new(namespace: nil, cache_key_with_version: false)
+ context 'when namespace is set' do
+ context 'when cache_key_with_version is true' do
+ it 'expands out the key with namespace and Rails version' do
+ cache = described_class.new(namespace: namespace, cache_key_with_version: true)
+
+ cache_key = cache.cache_key(key)
- cache_key = cache.cache_key(key)
+ expect(cache_key).to eq("#{namespace}:#{key}:#{Gitlab::VERSION}:#{Rails.version}")
+ end
+ end
- expect(cache_key).to eq(key)
+ context 'when cache_key_with_version is false' do
+ it 'expands out the key with namespace' do
+ cache = described_class.new(namespace: namespace, cache_key_with_version: false)
+
+ cache_key = cache.cache_key(key)
+
+ expect(cache_key).to eq("#{namespace}:#{key}")
+ end
end
end
end
diff --git a/spec/lib/gitlab/kubernetes_spec.rb b/spec/lib/gitlab/kubernetes_spec.rb
index 45369b91ed6..a7ea942960b 100644
--- a/spec/lib/gitlab/kubernetes_spec.rb
+++ b/spec/lib/gitlab/kubernetes_spec.rb
@@ -67,6 +67,30 @@ describe Gitlab::Kubernetes do
end
end
+ describe '#filter_by_legacy_label' do
+ let(:non_matching_pod) { kube_pod(environment_slug: 'production', project_slug: 'my-cool-app') }
+
+ let(:non_matching_pod_2) do
+ kube_pod(environment_slug: 'production', project_slug: 'my-cool-app').tap do |pod|
+ pod['metadata']['labels']['app'] = 'production'
+ end
+ end
+
+ let(:matching_pod) do
+ kube_pod.tap do |pod|
+ pod['metadata']['annotations'].delete('app.gitlab.com/env')
+ pod['metadata']['annotations'].delete('app.gitlab.com/app')
+ pod['metadata']['labels']['app'] = 'production'
+ end
+ end
+
+ it 'returns matching labels' do
+ items = [non_matching_pod, non_matching_pod_2, matching_pod]
+
+ expect(filter_by_legacy_label(items, 'my-cool-app', 'production')).to contain_exactly(matching_pod)
+ end
+ end
+
describe '#to_kubeconfig' do
let(:token) { 'TOKEN' }
let(:ca_pem) { 'PEM' }
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index cbbb22ad78c..11af6837dab 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -99,15 +99,9 @@ describe Notify do
end
end
- context 'when enabled email_author_in_body' do
- before do
- stub_application_setting(email_author_in_body: true)
- end
-
- it 'contains a link to note author' do
- is_expected.to have_body_text(issue.author_name)
- is_expected.to have_body_text 'created an issue:'
- end
+ it 'contains a link to issue author' do
+ is_expected.to have_body_text(issue.author_name)
+ is_expected.to have_body_text 'created an issue:'
end
end
@@ -314,15 +308,9 @@ describe Notify do
end
end
- context 'when enabled email_author_in_body' do
- before do
- stub_application_setting(email_author_in_body: true)
- end
-
- it 'contains a link to note author' do
- is_expected.to have_body_text merge_request.author_name
- is_expected.to have_body_text 'created a merge request:'
- end
+ it 'contains a link to merge request author' do
+ is_expected.to have_body_text merge_request.author_name
+ is_expected.to have_body_text 'created a merge request:'
end
end
@@ -907,7 +895,9 @@ describe Notify do
end
it 'contains an introduction' do
- is_expected.to have_body_text 'started a new discussion'
+ issuable_url = "project_#{note.noteable_type.underscore}_url"
+
+ is_expected.to have_body_text "started a new <a href=\"#{public_send(issuable_url, project, note.noteable, anchor: "note_#{note.id}")}\">discussion</a>"
end
context 'when a comment on an existing discussion' do
diff --git a/spec/models/clusters/platforms/kubernetes_spec.rb b/spec/models/clusters/platforms/kubernetes_spec.rb
index 0fa5d031736..05b3035e591 100644
--- a/spec/models/clusters/platforms/kubernetes_spec.rb
+++ b/spec/models/clusters/platforms/kubernetes_spec.rb
@@ -484,27 +484,4 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
it { is_expected.to include(pods: []) }
end
end
-
- describe '#update_kubernetes_namespace' do
- let(:cluster) { create(:cluster, :provided_by_gcp) }
- let(:platform) { cluster.platform }
-
- context 'when namespace is updated' do
- it 'calls ConfigureWorker' do
- expect(ClusterConfigureWorker).to receive(:perform_async).with(cluster.id).once
-
- platform.namespace = 'new-namespace'
- platform.save
- end
- end
-
- context 'when namespace is not updated' do
- it 'does not call ConfigureWorker' do
- expect(ClusterConfigureWorker).not_to receive(:perform_async)
-
- platform.username = "new-username"
- platform.save
- end
- end
- end
end
diff --git a/spec/services/clusters/gcp/finalize_creation_service_spec.rb b/spec/services/clusters/gcp/finalize_creation_service_spec.rb
index 2664649df47..5f91acb8e84 100644
--- a/spec/services/clusters/gcp/finalize_creation_service_spec.rb
+++ b/spec/services/clusters/gcp/finalize_creation_service_spec.rb
@@ -19,10 +19,6 @@ describe Clusters::Gcp::FinalizeCreationService, '#execute' do
subject { described_class.new.execute(provider) }
- before do
- allow(ClusterConfigureWorker).to receive(:perform_async)
- end
-
shared_examples 'success' do
it 'configures provider and kubernetes' do
subject
@@ -42,12 +38,6 @@ describe Clusters::Gcp::FinalizeCreationService, '#execute' do
expect(platform.password).to eq(password)
expect(platform.token).to eq(token)
end
-
- it 'calls ClusterConfigureWorker in a ascync fashion' do
- expect(ClusterConfigureWorker).to receive(:perform_async).with(cluster.id)
-
- subject
- end
end
shared_examples 'error' do
diff --git a/spec/services/clusters/update_service_spec.rb b/spec/services/clusters/update_service_spec.rb
index 21b37f88fd8..3ee45375dca 100644
--- a/spec/services/clusters/update_service_spec.rb
+++ b/spec/services/clusters/update_service_spec.rb
@@ -39,7 +39,6 @@ describe Clusters::UpdateService do
end
before do
- allow(ClusterConfigureWorker).to receive(:perform_async)
stub_kubeclient_get_namespace('https://kubernetes.example.com', namespace: 'my-namespace')
end
diff --git a/spec/support/shared_examples/notify_shared_examples.rb b/spec/support/shared_examples/notify_shared_examples.rb
index 897c9106d77..6894a63ce42 100644
--- a/spec/support/shared_examples/notify_shared_examples.rb
+++ b/spec/support/shared_examples/notify_shared_examples.rb
@@ -281,18 +281,8 @@ shared_examples 'a note email' do
is_expected.to have_body_text note.note
end
- it 'does not contain note author' do
- is_expected.not_to have_body_text note.author_name
- end
-
- context 'when enabled email_author_in_body' do
- before do
- stub_application_setting(email_author_in_body: true)
- end
-
- it 'contains a link to note author' do
- is_expected.to have_body_text note.author_name
- end
+ it 'contains a link to note author' do
+ is_expected.to have_body_text note.author_name
end
end
diff --git a/spec/workers/cluster_provision_worker_spec.rb b/spec/workers/cluster_provision_worker_spec.rb
index 9cc2ad12bfc..3f69962f25d 100644
--- a/spec/workers/cluster_provision_worker_spec.rb
+++ b/spec/workers/cluster_provision_worker_spec.rb
@@ -23,18 +23,11 @@ describe ClusterProvisionWorker do
described_class.new.perform(cluster.id)
end
-
- it 'configures kubernetes platform' do
- expect(ClusterConfigureWorker).to receive(:perform_async).with(cluster.id)
-
- described_class.new.perform(cluster.id)
- end
end
context 'when cluster does not exist' do
it 'does not provision a cluster' do
expect_any_instance_of(Clusters::Gcp::ProvisionService).not_to receive(:execute)
- expect(ClusterConfigureWorker).not_to receive(:perform_async)
described_class.new.perform(123)
end
diff --git a/yarn.lock b/yarn.lock
index 2e46217ae50..5b725f07c93 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8699,10 +8699,10 @@ prettier@1.16.3:
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.3.tgz#8c62168453badef702f34b45b6ee899574a6a65d"
integrity sha512-kn/GU6SMRYPxUakNXhpP0EedT/KmaPzr0H5lIsDogrykbaxOpOfAFfk5XA7DZrJyMAv1wlMV3CPcZruGXVVUZw==
-prettier@1.16.4:
- version "1.16.4"
- resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.4.tgz#73e37e73e018ad2db9c76742e2647e21790c9717"
- integrity sha512-ZzWuos7TI5CKUeQAtFd6Zhm2s6EpAD/ZLApIhsF9pRvRtM1RFo61dM/4MSRUA0SuLugA/zgrZD8m0BaY46Og7g==
+prettier@1.18.2:
+ version "1.18.2"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"
+ integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==
pretty-format@^24.8.0:
version "24.8.0"