From ec246c2be152e2d5ccd9d74ef01df06d33d82a5c Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 30 May 2022 21:09:18 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../stylesheets/startup/startup-dark.scss | 9 ++-- .../stylesheets/startup/startup-general.scss | 9 ++-- app/graphql/mutations/work_items/create.rb | 3 +- .../mutations/work_items/create_from_task.rb | 2 +- app/graphql/mutations/work_items/delete.rb | 2 +- .../mutations/work_items/delete_task.rb | 3 +- app/graphql/mutations/work_items/update.rb | 2 +- .../mutations/work_items/update_task.rb | 3 +- app/graphql/types/mutation_type.rb | 12 +++--- app/graphql/types/query_type.rb | 4 +- app/views/layouts/header/_default.html.haml | 4 +- .../ci_database_worker.rb | 6 +-- .../single_database_worker.rb | 4 +- .../batched_background_migration_worker.rb | 4 -- ...hed_migrations_on_schedule_ci_database.yml | 8 ---- db/docs/agent_activity_events.yml | 2 +- db/docs/agent_group_authorizations.yml | 2 +- db/docs/agent_project_authorizations.yml | 2 +- db/docs/aws_roles.yml | 2 +- db/docs/ci_pipeline_chat_data.yml | 2 +- db/docs/cluster_agent_tokens.yml | 2 +- db/docs/cluster_agents.yml | 2 +- db/docs/cluster_groups.yml | 2 +- db/docs/cluster_platforms_kubernetes.yml | 2 +- db/docs/cluster_projects.yml | 2 +- db/docs/cluster_providers_aws.yml | 2 +- db/docs/cluster_providers_gcp.yml | 2 +- .../clusters_applications_cert_managers.yml | 2 +- db/docs/clusters_applications_crossplane.yml | 2 +- .../clusters_applications_elastic_stacks.yml | 2 +- db/docs/clusters_applications_helm.yml | 2 +- db/docs/clusters_applications_ingress.yml | 2 +- db/docs/clusters_applications_jupyter.yml | 2 +- db/docs/clusters_applications_knative.yml | 2 +- db/docs/clusters_applications_runners.yml | 2 +- db/docs/clusters_kubernetes_namespaces.yml | 2 +- db/docs/deployment_clusters.yml | 4 +- db/docs/project_auto_devops.yml | 2 +- db/docs/serverless_domain_cluster.yml | 4 +- db/docs/terraform_state_versions.yml | 2 +- db/docs/terraform_states.yml | 2 +- doc/api/graphql/reference/index.md | 42 +++++++++++++++---- doc/install/installation.md | 8 ++-- doc/update/upgrading_from_source.md | 8 ++-- ...ground_migration_worker_shared_examples.rb | 20 +++++---- .../ci_database_worker_spec.rb | 2 +- ...atched_background_migration_worker_spec.rb | 2 +- 47 files changed, 116 insertions(+), 97 deletions(-) delete mode 100644 config/feature_flags/ops/execute_batched_migrations_on_schedule_ci_database.yml diff --git a/app/assets/stylesheets/startup/startup-dark.scss b/app/assets/stylesheets/startup/startup-dark.scss index 7e3538f0fa3..0121fbc3cf9 100644 --- a/app/assets/stylesheets/startup/startup-dark.scss +++ b/app/assets/stylesheets/startup/startup-dark.scss @@ -350,9 +350,6 @@ button::-moz-focus-inner, white-space: nowrap; border: 0; } -.m-auto { - margin: auto !important; -} .gl-badge { display: inline-flex; align-items: center; @@ -2062,12 +2059,18 @@ body.gl-dark { .gl-display-inline-block\! { display: inline-block !important; } +.gl-align-items-center { + align-items: center; +} .gl-align-items-stretch { align-items: stretch; } .gl-flex-grow-1 { flex-grow: 1; } +.gl-justify-content-end { + justify-content: flex-end; +} .gl-relative { position: relative; } diff --git a/app/assets/stylesheets/startup/startup-general.scss b/app/assets/stylesheets/startup/startup-general.scss index 0e53f6ea4de..6fd5148fabf 100644 --- a/app/assets/stylesheets/startup/startup-general.scss +++ b/app/assets/stylesheets/startup/startup-general.scss @@ -335,9 +335,6 @@ button::-moz-focus-inner, white-space: nowrap; border: 0; } -.m-auto { - margin: auto !important; -} .gl-badge { display: inline-flex; align-items: center; @@ -1722,12 +1719,18 @@ svg.s16 { .gl-display-inline-block\! { display: inline-block !important; } +.gl-align-items-center { + align-items: center; +} .gl-align-items-stretch { align-items: stretch; } .gl-flex-grow-1 { flex-grow: 1; } +.gl-justify-content-end { + justify-content: flex-end; +} .gl-relative { position: relative; } diff --git a/app/graphql/mutations/work_items/create.rb b/app/graphql/mutations/work_items/create.rb index 2e136d409ab..2ae26ed0e1a 100644 --- a/app/graphql/mutations/work_items/create.rb +++ b/app/graphql/mutations/work_items/create.rb @@ -8,8 +8,7 @@ module Mutations include Mutations::SpamProtection include FindsProject - description "Creates a work item." \ - " Available only when feature flag `work_items` is enabled. The feature is experimental and is subject to change without notice." + description "Creates a work item. Available only when feature flag `work_items` is enabled." authorize :create_work_item diff --git a/app/graphql/mutations/work_items/create_from_task.rb b/app/graphql/mutations/work_items/create_from_task.rb index 4da709401a6..5ebe8b2c6d7 100644 --- a/app/graphql/mutations/work_items/create_from_task.rb +++ b/app/graphql/mutations/work_items/create_from_task.rb @@ -8,7 +8,7 @@ module Mutations include Mutations::SpamProtection description "Creates a work item from a task in another work item's description." \ - " Available only when feature flag `work_items` is enabled. This feature is experimental and is subject to change without notice." + " Available only when feature flag `work_items` is enabled." authorize :update_work_item diff --git a/app/graphql/mutations/work_items/delete.rb b/app/graphql/mutations/work_items/delete.rb index 1830ab5443c..240a8b4c11e 100644 --- a/app/graphql/mutations/work_items/delete.rb +++ b/app/graphql/mutations/work_items/delete.rb @@ -5,7 +5,7 @@ module Mutations class Delete < BaseMutation graphql_name 'WorkItemDelete' description "Deletes a work item." \ - " Available only when feature flag `work_items` is enabled. The feature is experimental and is subject to change without notice." + " Available only when feature flag `work_items` is enabled." authorize :delete_work_item diff --git a/app/graphql/mutations/work_items/delete_task.rb b/app/graphql/mutations/work_items/delete_task.rb index 87620a28fa1..b1bfed0cbf1 100644 --- a/app/graphql/mutations/work_items/delete_task.rb +++ b/app/graphql/mutations/work_items/delete_task.rb @@ -6,8 +6,7 @@ module Mutations graphql_name 'WorkItemDeleteTask' description "Deletes a task in a work item's description." \ - ' Available only when feature flag `work_items` is enabled. This feature is experimental and' \ - ' is subject to change without notice.' + ' Available only when feature flag `work_items` is enabled.' authorize :update_work_item diff --git a/app/graphql/mutations/work_items/update.rb b/app/graphql/mutations/work_items/update.rb index e8c5bb72340..c495da00f41 100644 --- a/app/graphql/mutations/work_items/update.rb +++ b/app/graphql/mutations/work_items/update.rb @@ -5,7 +5,7 @@ module Mutations class Update < BaseMutation graphql_name 'WorkItemUpdate' description "Updates a work item by Global ID." \ - " Available only when feature flag `work_items` is enabled. The feature is experimental and is subject to change without notice." + " Available only when feature flag `work_items` is enabled." include Mutations::SpamProtection include Mutations::WorkItems::UpdateArguments diff --git a/app/graphql/mutations/work_items/update_task.rb b/app/graphql/mutations/work_items/update_task.rb index 8a94004c3e2..35fbe672b66 100644 --- a/app/graphql/mutations/work_items/update_task.rb +++ b/app/graphql/mutations/work_items/update_task.rb @@ -5,8 +5,7 @@ module Mutations class UpdateTask < BaseMutation graphql_name 'WorkItemUpdateTask' description "Updates a work item's task by Global ID." \ - " Available only when feature flag `work_items` is enabled. The feature is experimental and is" \ - " subject to change without notice." + " Available only when feature flag `work_items` is enabled." include Mutations::SpamProtection diff --git a/app/graphql/types/mutation_type.rb b/app/graphql/types/mutation_type.rb index b9cf66edaaf..224ed73bacd 100644 --- a/app/graphql/types/mutation_type.rb +++ b/app/graphql/types/mutation_type.rb @@ -137,12 +137,12 @@ module Types mount_mutation Mutations::Packages::Destroy mount_mutation Mutations::Packages::DestroyFile mount_mutation Mutations::Echo - mount_mutation Mutations::WorkItems::Create - mount_mutation Mutations::WorkItems::CreateFromTask - mount_mutation Mutations::WorkItems::Delete - mount_mutation Mutations::WorkItems::DeleteTask - mount_mutation Mutations::WorkItems::Update - mount_mutation Mutations::WorkItems::UpdateTask + mount_mutation Mutations::WorkItems::Create, deprecated: { milestone: '15.1', reason: :alpha } + mount_mutation Mutations::WorkItems::CreateFromTask, deprecated: { milestone: '15.1', reason: :alpha } + mount_mutation Mutations::WorkItems::Delete, deprecated: { milestone: '15.1', reason: :alpha } + mount_mutation Mutations::WorkItems::DeleteTask, deprecated: { milestone: '15.1', reason: :alpha } + mount_mutation Mutations::WorkItems::Update, deprecated: { milestone: '15.1', reason: :alpha } + mount_mutation Mutations::WorkItems::UpdateTask, deprecated: { milestone: '15.1', reason: :alpha } mount_mutation Mutations::SavedReplies::Create mount_mutation Mutations::SavedReplies::Update mount_mutation Mutations::SavedReplies::Destroy diff --git a/app/graphql/types/query_type.rb b/app/graphql/types/query_type.rb index bc3774bcc1d..46d121f6552 100644 --- a/app/graphql/types/query_type.rb +++ b/app/graphql/types/query_type.rb @@ -91,8 +91,8 @@ module Types field :work_item, Types::WorkItemType, null: true, resolver: Resolvers::WorkItemResolver, - description: 'Find a work item. Returns `null` if `work_items` feature flag is disabled.' \ - ' The feature is experimental and is subject to change without notice.' + deprecated: { milestone: '15.1', reason: :alpha }, + description: 'Find a work item. Returns `null` if `work_items` feature flag is disabled.' field :merge_request, Types::MergeRequestType, null: true, diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index be699c566ab..f59f25f37b5 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -29,12 +29,12 @@ = render "layouts/nav/top_nav" .navbar-collapse.gl-transition-medium.collapse - %ul.nav.navbar-nav.gl-w-full + %ul.nav.navbar-nav.gl-w-full.gl-align-items-center.gl-justify-content-end - if current_user = render 'layouts/header/new_dropdown', class: 'gl-display-none gl-sm-display-block gl-white-space-nowrap gl-text-right' - if top_nav_show_search - search_menu_item = top_nav_search_menu_item_attrs - %li.nav-item.header-search-new.gl-display-none.gl-lg-display-block.m-auto.gl-w-full + %li.nav-item.header-search-new.gl-display-none.gl-lg-display-block.gl-w-full - unless current_controller?(:search) - if Feature.enabled?(:new_header_search) = render 'layouts/header_search' diff --git a/app/workers/database/batched_background_migration/ci_database_worker.rb b/app/workers/database/batched_background_migration/ci_database_worker.rb index ee9cbba7076..b04db87631a 100644 --- a/app/workers/database/batched_background_migration/ci_database_worker.rb +++ b/app/workers/database/batched_background_migration/ci_database_worker.rb @@ -4,12 +4,8 @@ module Database class CiDatabaseWorker # rubocop:disable Scalability/IdempotentWorker include SingleDatabaseWorker - def self.enabled? - Feature.enabled?(:execute_batched_migrations_on_schedule_ci_database, type: :ops) - end - def self.tracking_database - @tracking_database ||= Gitlab::Database::CI_DATABASE_NAME + @tracking_database ||= Gitlab::Database::CI_DATABASE_NAME.to_sym end end end diff --git a/app/workers/database/batched_background_migration/single_database_worker.rb b/app/workers/database/batched_background_migration/single_database_worker.rb index 8a0de268048..cfbd44ba397 100644 --- a/app/workers/database/batched_background_migration/single_database_worker.rb +++ b/app/workers/database/batched_background_migration/single_database_worker.rb @@ -24,11 +24,11 @@ module Database def tracking_database raise NotImplementedError, "#{self.name} does not implement #{__method__}" end + # :nocov: def enabled? - raise NotImplementedError, "#{self.name} does not implement #{__method__}" + Feature.enabled?(:execute_batched_migrations_on_schedule, type: :ops) end - # :nocov: def lease_key name.demodulize.underscore diff --git a/app/workers/database/batched_background_migration_worker.rb b/app/workers/database/batched_background_migration_worker.rb index 31208d7a473..29804be832d 100644 --- a/app/workers/database/batched_background_migration_worker.rb +++ b/app/workers/database/batched_background_migration_worker.rb @@ -4,10 +4,6 @@ module Database class BatchedBackgroundMigrationWorker # rubocop:disable Scalability/IdempotentWorker include BatchedBackgroundMigration::SingleDatabaseWorker - def self.enabled? - Feature.enabled?(:execute_batched_migrations_on_schedule, type: :ops) - end - def self.tracking_database @tracking_database ||= Gitlab::Database::MAIN_DATABASE_NAME.to_sym end diff --git a/config/feature_flags/ops/execute_batched_migrations_on_schedule_ci_database.yml b/config/feature_flags/ops/execute_batched_migrations_on_schedule_ci_database.yml deleted file mode 100644 index 9efbbd014a1..00000000000 --- a/config/feature_flags/ops/execute_batched_migrations_on_schedule_ci_database.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: execute_batched_migrations_on_schedule_ci_database -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83109 -rollout_issue_url: -milestone: '14.9' -type: ops -group: group::database -default_enabled: false diff --git a/db/docs/agent_activity_events.yml b/db/docs/agent_activity_events.yml index 82e6481be42..3be300e1852 100644 --- a/db/docs/agent_activity_events.yml +++ b/db/docs/agent_activity_events.yml @@ -4,6 +4,6 @@ classes: - Clusters::Agents::ActivityEvent feature_categories: - kubernetes_management -description: TODO +description: Historical timeline events belonging to a cluster agent introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74577 milestone: '14.6' diff --git a/db/docs/agent_group_authorizations.yml b/db/docs/agent_group_authorizations.yml index 1c250b90b6d..3592c93ed83 100644 --- a/db/docs/agent_group_authorizations.yml +++ b/db/docs/agent_group_authorizations.yml @@ -4,6 +4,6 @@ classes: - Clusters::Agents::GroupAuthorization feature_categories: - kubernetes_management -description: TODO +description: Configuration for a group that is authorized to use a particular cluster agent introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68023 milestone: '14.3' diff --git a/db/docs/agent_project_authorizations.yml b/db/docs/agent_project_authorizations.yml index 3ac48b0d35b..c4e101f754f 100644 --- a/db/docs/agent_project_authorizations.yml +++ b/db/docs/agent_project_authorizations.yml @@ -4,6 +4,6 @@ classes: - Clusters::Agents::ProjectAuthorization feature_categories: - kubernetes_management -description: TODO +description: Configuration for a project that is authorized to use a particular cluster agent introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67295 milestone: '14.3' diff --git a/db/docs/aws_roles.yml b/db/docs/aws_roles.yml index c278809e5fd..df308acc423 100644 --- a/db/docs/aws_roles.yml +++ b/db/docs/aws_roles.yml @@ -4,6 +4,6 @@ classes: - Aws::Role feature_categories: - kubernetes_management -description: TODO +description: (Deprecated) AWS IAM role for creating EKS clusters via GitLab introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17057 milestone: '12.4' diff --git a/db/docs/ci_pipeline_chat_data.yml b/db/docs/ci_pipeline_chat_data.yml index 4f7152d0b56..1edd3c923f2 100644 --- a/db/docs/ci_pipeline_chat_data.yml +++ b/db/docs/ci_pipeline_chat_data.yml @@ -4,6 +4,6 @@ classes: - Ci::PipelineChatData feature_categories: - chatops -description: TODO +description: Stores information about a CI pipeline created via chatops introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/4466 milestone: '10.6' diff --git a/db/docs/cluster_agent_tokens.yml b/db/docs/cluster_agent_tokens.yml index 0d6265789f1..a08684e4e84 100644 --- a/db/docs/cluster_agent_tokens.yml +++ b/db/docs/cluster_agent_tokens.yml @@ -4,6 +4,6 @@ classes: - Clusters::AgentToken feature_categories: - kubernetes_management -description: TODO +description: Tokens used by cluster agents to connect to GitLab introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/33228 milestone: '13.3' diff --git a/db/docs/cluster_agents.yml b/db/docs/cluster_agents.yml index 6593542dad6..59090f2ff75 100644 --- a/db/docs/cluster_agents.yml +++ b/db/docs/cluster_agents.yml @@ -4,6 +4,6 @@ classes: - Clusters::Agent feature_categories: - kubernetes_management -description: TODO +description: Represents a GitLab Agent for Kubernetes installed in a Kubernetes cluster introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/33228 milestone: '13.3' diff --git a/db/docs/cluster_groups.yml b/db/docs/cluster_groups.yml index 0df250586a7..8a20ad3d562 100644 --- a/db/docs/cluster_groups.yml +++ b/db/docs/cluster_groups.yml @@ -4,6 +4,6 @@ classes: - Clusters::Group feature_categories: - kubernetes_management -description: TODO +description: (Deprecated) Join table between 'clusters' and 'namespaces' introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/0e15eec86d83cbdfefe17966bf5c02e4d419a34d milestone: '11.5' diff --git a/db/docs/cluster_platforms_kubernetes.yml b/db/docs/cluster_platforms_kubernetes.yml index 7571ef7d546..ab1b53e36b4 100644 --- a/db/docs/cluster_platforms_kubernetes.yml +++ b/db/docs/cluster_platforms_kubernetes.yml @@ -4,6 +4,6 @@ classes: - Clusters::Platforms::Kubernetes feature_categories: - kubernetes_management -description: TODO +description: (Deprecated) Kubernetes specific details for a cluster integration introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/d0cff7f5855f91b5479f9fdaa39d8d95ec691a9e milestone: '10.2' diff --git a/db/docs/cluster_projects.yml b/db/docs/cluster_projects.yml index ecc7680a205..51f996c0d5c 100644 --- a/db/docs/cluster_projects.yml +++ b/db/docs/cluster_projects.yml @@ -4,6 +4,6 @@ classes: - Clusters::Project feature_categories: - kubernetes_management -description: TODO +description: (Deprecated) Join table between 'clusters' and 'projects' introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/d0cff7f5855f91b5479f9fdaa39d8d95ec691a9e milestone: '10.2' diff --git a/db/docs/cluster_providers_aws.yml b/db/docs/cluster_providers_aws.yml index 21a698c882a..1af9a814685 100644 --- a/db/docs/cluster_providers_aws.yml +++ b/db/docs/cluster_providers_aws.yml @@ -4,6 +4,6 @@ classes: - Clusters::Providers::Aws feature_categories: - kubernetes_management -description: TODO +description: (Deprecated) AWS specific details for an EKS cluster integration introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17057 milestone: '12.4' diff --git a/db/docs/cluster_providers_gcp.yml b/db/docs/cluster_providers_gcp.yml index 7aa02089e6c..3ef9ebb995c 100644 --- a/db/docs/cluster_providers_gcp.yml +++ b/db/docs/cluster_providers_gcp.yml @@ -4,6 +4,6 @@ classes: - Clusters::Providers::Gcp feature_categories: - kubernetes_management -description: TODO +description: (Deprecated) GCP specific details for a GKE cluster integration introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/d0cff7f5855f91b5479f9fdaa39d8d95ec691a9e milestone: '10.2' diff --git a/db/docs/clusters_applications_cert_managers.yml b/db/docs/clusters_applications_cert_managers.yml index 5b75dceb08e..bf85400c3ae 100644 --- a/db/docs/clusters_applications_cert_managers.yml +++ b/db/docs/clusters_applications_cert_managers.yml @@ -4,6 +4,6 @@ classes: - Clusters::Applications::CertManager feature_categories: - kubernetes_management -description: TODO +description: (Deprecated) A GitLab managed cert-manager installation in a Kubernetes cluster introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/8837519445c319a699e0f3ced1c6912c839f3389 milestone: '11.6' diff --git a/db/docs/clusters_applications_crossplane.yml b/db/docs/clusters_applications_crossplane.yml index 8bc2dde17f3..ef9bbed9415 100644 --- a/db/docs/clusters_applications_crossplane.yml +++ b/db/docs/clusters_applications_crossplane.yml @@ -4,6 +4,6 @@ classes: - Clusters::Applications::Crossplane feature_categories: - kubernetes_management -description: TODO +description: (Deprecated) A GitLab managed Crossplane installation in a Kubernetes cluster introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18797 milestone: '12.5' diff --git a/db/docs/clusters_applications_elastic_stacks.yml b/db/docs/clusters_applications_elastic_stacks.yml index 1b1aa716afe..97943a9516b 100644 --- a/db/docs/clusters_applications_elastic_stacks.yml +++ b/db/docs/clusters_applications_elastic_stacks.yml @@ -4,6 +4,6 @@ classes: - Clusters::Applications::ElasticStack feature_categories: - kubernetes_management -description: TODO +description: (Deprecated) A GitLab managed Elastic Stack installation in a Kubernetes cluster introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18015 milestone: '12.5' diff --git a/db/docs/clusters_applications_helm.yml b/db/docs/clusters_applications_helm.yml index 18bc1fa82b4..83014ab9221 100644 --- a/db/docs/clusters_applications_helm.yml +++ b/db/docs/clusters_applications_helm.yml @@ -4,6 +4,6 @@ classes: - Clusters::Applications::Helm feature_categories: - kubernetes_management -description: TODO +description: (Deprecated) A GitLab managed Helm installation in a Kubernetes cluster introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/64be8d70ae20928df351e495a3442bb6036bc3e7 milestone: '10.2' diff --git a/db/docs/clusters_applications_ingress.yml b/db/docs/clusters_applications_ingress.yml index 686b01e9bdb..73c0d8d7cb4 100644 --- a/db/docs/clusters_applications_ingress.yml +++ b/db/docs/clusters_applications_ingress.yml @@ -4,6 +4,6 @@ classes: - Clusters::Applications::Ingress feature_categories: - kubernetes_management -description: TODO +description: (Deprecated) A GitLab managed Ingress installation in a Kubernetes cluster introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/d8223468ae2ae061020cc26336c51dc93cc75571 milestone: '10.2' diff --git a/db/docs/clusters_applications_jupyter.yml b/db/docs/clusters_applications_jupyter.yml index bf793d9411e..faff294bf6b 100644 --- a/db/docs/clusters_applications_jupyter.yml +++ b/db/docs/clusters_applications_jupyter.yml @@ -4,6 +4,6 @@ classes: - Clusters::Applications::Jupyter feature_categories: - kubernetes_management -description: TODO +description: (Deprecated) A GitLab managed Jupyter installation in a Kubernetes cluster introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/db9f765852d9fef464e69c0bf47a382f2ab7219d milestone: '11.0' diff --git a/db/docs/clusters_applications_knative.yml b/db/docs/clusters_applications_knative.yml index a30df20c5cf..4d8d3a30ad5 100644 --- a/db/docs/clusters_applications_knative.yml +++ b/db/docs/clusters_applications_knative.yml @@ -4,6 +4,6 @@ classes: - Clusters::Applications::Knative feature_categories: - kubernetes_management -description: TODO +description: (Deprecated) A GitLab managed Knative installation in a Kubernetes cluster introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/b5155b90ee233e2824c168fbb06b3ce5d3aeb194 milestone: '11.5' diff --git a/db/docs/clusters_applications_runners.yml b/db/docs/clusters_applications_runners.yml index f26302c2d3c..06c43337b83 100644 --- a/db/docs/clusters_applications_runners.yml +++ b/db/docs/clusters_applications_runners.yml @@ -4,6 +4,6 @@ classes: - Clusters::Applications::Runner feature_categories: - kubernetes_management -description: TODO +description: (Deprecated) A GitLab managed Runner installation in a Kubernetes cluster introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/c607008ee55e35465e04a938a341f2f24cb6761f milestone: '10.6' diff --git a/db/docs/clusters_kubernetes_namespaces.yml b/db/docs/clusters_kubernetes_namespaces.yml index 5027b6f27b4..0772f9ce877 100644 --- a/db/docs/clusters_kubernetes_namespaces.yml +++ b/db/docs/clusters_kubernetes_namespaces.yml @@ -4,6 +4,6 @@ classes: - Clusters::KubernetesNamespace feature_categories: - kubernetes_management -description: TODO +description: (Deprecated) A Kubernetes namespace in a GitLab managed Kubernetes cluster introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/e3ca493876ab71ed29817a0af436fc563f564bbe milestone: '11.5' diff --git a/db/docs/deployment_clusters.yml b/db/docs/deployment_clusters.yml index 454c93b34a1..e23278d0e00 100644 --- a/db/docs/deployment_clusters.yml +++ b/db/docs/deployment_clusters.yml @@ -3,7 +3,7 @@ table_name: deployment_clusters classes: - DeploymentCluster feature_categories: -- deployment_management -description: TODO +- kubernetes_management +description: (Deprecated) Join table between `deployments` and `clusters` introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/24235 milestone: '12.8' diff --git a/db/docs/project_auto_devops.yml b/db/docs/project_auto_devops.yml index 86841b585c3..dd960ecc4eb 100644 --- a/db/docs/project_auto_devops.yml +++ b/db/docs/project_auto_devops.yml @@ -4,6 +4,6 @@ classes: - ProjectAutoDevops feature_categories: - auto_devops -description: TODO +description: Auto DevOps settings for a project introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/6ed490401f49a8941dc7a9e3757ec4012f14ef0b milestone: '10.0' diff --git a/db/docs/serverless_domain_cluster.yml b/db/docs/serverless_domain_cluster.yml index d41f8b45c27..2692eb22096 100644 --- a/db/docs/serverless_domain_cluster.yml +++ b/db/docs/serverless_domain_cluster.yml @@ -3,7 +3,7 @@ table_name: serverless_domain_cluster classes: - Serverless::DomainCluster feature_categories: -- deployment_management -description: TODO +- kubernetes_management +description: (Deprecated) A custom domain for a GitLab managed Knative installation introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/19835 milestone: '12.6' diff --git a/db/docs/terraform_state_versions.yml b/db/docs/terraform_state_versions.yml index a812d2a209e..1d98b049f45 100644 --- a/db/docs/terraform_state_versions.yml +++ b/db/docs/terraform_state_versions.yml @@ -4,6 +4,6 @@ classes: - Terraform::StateVersion feature_categories: - infrastructure_as_code -description: TODO +description: Represents a Terraform state file at a point in time, with a corresponding file stored in object storage introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35211 milestone: '13.4' diff --git a/db/docs/terraform_states.yml b/db/docs/terraform_states.yml index 78a277cafd6..dc2bc799582 100644 --- a/db/docs/terraform_states.yml +++ b/db/docs/terraform_states.yml @@ -4,6 +4,6 @@ classes: - Terraform::State feature_categories: - infrastructure_as_code -description: TODO +description: Represents a Terraform state backend introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26619 milestone: '13.0' diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md index 9860abcb8e6..3f189fc73e7 100644 --- a/doc/api/graphql/reference/index.md +++ b/doc/api/graphql/reference/index.md @@ -556,7 +556,11 @@ Returns [`Vulnerability`](#vulnerability). ### `Query.workItem` -Find a work item. Returns `null` if `work_items` feature flag is disabled. The feature is experimental and is subject to change without notice. +Find a work item. Returns `null` if `work_items` feature flag is disabled. + +WARNING: +**Deprecated** in 15.1. +This feature is in Alpha, and can be removed or changed at any point. Returns [`WorkItem`](#workitem). @@ -5365,7 +5369,11 @@ Input type: `VulnerabilityRevertToDetectedInput` ### `Mutation.workItemCreate` -Creates a work item. Available only when feature flag `work_items` is enabled. The feature is experimental and is subject to change without notice. +Creates a work item. Available only when feature flag `work_items` is enabled. + +WARNING: +**Deprecated** in 15.1. +This feature is in Alpha, and can be removed or changed at any point. Input type: `WorkItemCreateInput` @@ -5389,7 +5397,11 @@ Input type: `WorkItemCreateInput` ### `Mutation.workItemCreateFromTask` -Creates a work item from a task in another work item's description. Available only when feature flag `work_items` is enabled. This feature is experimental and is subject to change without notice. +Creates a work item from a task in another work item's description. Available only when feature flag `work_items` is enabled. + +WARNING: +**Deprecated** in 15.1. +This feature is in Alpha, and can be removed or changed at any point. Input type: `WorkItemCreateFromTaskInput` @@ -5412,7 +5424,11 @@ Input type: `WorkItemCreateFromTaskInput` ### `Mutation.workItemDelete` -Deletes a work item. Available only when feature flag `work_items` is enabled. The feature is experimental and is subject to change without notice. +Deletes a work item. Available only when feature flag `work_items` is enabled. + +WARNING: +**Deprecated** in 15.1. +This feature is in Alpha, and can be removed or changed at any point. Input type: `WorkItemDeleteInput` @@ -5433,7 +5449,11 @@ Input type: `WorkItemDeleteInput` ### `Mutation.workItemDeleteTask` -Deletes a task in a work item's description. Available only when feature flag `work_items` is enabled. This feature is experimental and is subject to change without notice. +Deletes a task in a work item's description. Available only when feature flag `work_items` is enabled. + +WARNING: +**Deprecated** in 15.1. +This feature is in Alpha, and can be removed or changed at any point. Input type: `WorkItemDeleteTaskInput` @@ -5456,7 +5476,11 @@ Input type: `WorkItemDeleteTaskInput` ### `Mutation.workItemUpdate` -Updates a work item by Global ID. Available only when feature flag `work_items` is enabled. The feature is experimental and is subject to change without notice. +Updates a work item by Global ID. Available only when feature flag `work_items` is enabled. + +WARNING: +**Deprecated** in 15.1. +This feature is in Alpha, and can be removed or changed at any point. Input type: `WorkItemUpdateInput` @@ -5479,7 +5503,11 @@ Input type: `WorkItemUpdateInput` ### `Mutation.workItemUpdateTask` -Updates a work item's task by Global ID. Available only when feature flag `work_items` is enabled. The feature is experimental and is subject to change without notice. +Updates a work item's task by Global ID. Available only when feature flag `work_items` is enabled. + +WARNING: +**Deprecated** in 15.1. +This feature is in Alpha, and can be removed or changed at any point. Input type: `WorkItemUpdateTaskInput` diff --git a/doc/install/installation.md b/doc/install/installation.md index c24eba9cc58..ac3360f3d4f 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -246,11 +246,11 @@ page](https://go.dev/dl). # Remove former Go installation folder sudo rm -rf /usr/local/go -curl --remote-name --location --progress-bar "https://go.dev/dl/go1.16.10.linux-amd64.tar.gz" -echo '414cd18ce1d193769b9e97d2401ad718755ab47816e13b2a1cde203d263b55cf go1.16.10.linux-amd64.tar.gz' | shasum -a256 -c - && \ - sudo tar -C /usr/local -xzf go1.16.10.linux-amd64.tar.gz +curl --remote-name --location --progress-bar "https://go.dev/dl/go1.17.10.linux-amd64.tar.gz"" +echo '87fc728c9c731e2f74e4a999ef53cf07302d7ed3504b0839027bd9c10edaa3fd go1.17.10.linux-amd64.tar.gz' | shasum -a256 -c - && \ + sudo tar -C /usr/local -xzf go1.17.10.linux-amd64.tar.gz sudo ln -sf /usr/local/go/bin/{go,gofmt} /usr/local/bin/ -rm go1.16.10.linux-amd64.tar.gz +rm go1.17.10.linux-amd64.tar.gz ``` ## 4. Node diff --git a/doc/update/upgrading_from_source.md b/doc/update/upgrading_from_source.md index 6127cb1514e..1a36c76919a 100644 --- a/doc/update/upgrading_from_source.md +++ b/doc/update/upgrading_from_source.md @@ -107,11 +107,11 @@ Download and install Go (for Linux, 64-bit): # Remove former Go installation folder sudo rm -rf /usr/local/go -curl --remote-name --location --progress-bar "https://go.dev/dl/go1.16.10.linux-amd64.tar.gz" -echo '414cd18ce1d193769b9e97d2401ad718755ab47816e13b2a1cde203d263b55cf go1.16.10.linux-amd64.tar.gz' | shasum -a256 -c - && \ - sudo tar -C /usr/local -xzf go1.16.10.linux-amd64.tar.gz +curl --remote-name --location --progress-bar "https://go.dev/dl/go1.17.10.linux-amd64.tar.gz" +echo '87fc728c9c731e2f74e4a999ef53cf07302d7ed3504b0839027bd9c10edaa3fd go1.17.10.linux-amd64.tar.gz' | shasum -a256 -c - && \ + sudo tar -C /usr/local -xzf go1.17.10.linux-amd64.tar.gz sudo ln -sf /usr/local/go/bin/{go,gofmt} /usr/local/bin/ -rm go1.16.10.linux-amd64.tar.gz +rm go1.17.10.linux-amd64.tar.gz ``` ### 6. Update Git diff --git a/spec/support/shared_examples/workers/batched_background_migration_worker_shared_examples.rb b/spec/support/shared_examples/workers/batched_background_migration_worker_shared_examples.rb index 1349ca37c78..54962eac100 100644 --- a/spec/support/shared_examples/workers/batched_background_migration_worker_shared_examples.rb +++ b/spec/support/shared_examples/workers/batched_background_migration_worker_shared_examples.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -RSpec.shared_examples 'it runs batched background migration jobs' do |tracking_database, feature_flag:| +RSpec.shared_examples 'it runs batched background migration jobs' do |tracking_database| include ExclusiveLeaseHelpers describe 'defining the job attributes' do @@ -40,12 +40,16 @@ RSpec.shared_examples 'it runs batched background migration jobs' do |tracking_d end describe '.enabled?' do - it 'does not raise an error' do - expect { described_class.enabled? }.not_to raise_error + it 'returns true when execute_batched_migrations_on_schedule feature flag is enabled' do + stub_feature_flags(execute_batched_migrations_on_schedule: true) + + expect(described_class.enabled?).to be_truthy end - it 'returns true' do - expect(described_class.enabled?).to be_truthy + it 'returns false when execute_batched_migrations_on_schedule feature flag is disabled' do + stub_feature_flags(execute_batched_migrations_on_schedule: false) + + expect(described_class.enabled?).to be_falsey end end @@ -86,7 +90,7 @@ RSpec.shared_examples 'it runs batched background migration jobs' do |tracking_d context 'when the feature flag is disabled' do before do - stub_feature_flags(feature_flag => false) + stub_feature_flags(execute_batched_migrations_on_schedule: false) end it 'does nothing' do @@ -101,7 +105,7 @@ RSpec.shared_examples 'it runs batched background migration jobs' do |tracking_d let(:base_model) { Gitlab::Database.database_base_models[tracking_database] } before do - stub_feature_flags(feature_flag => true) + stub_feature_flags(execute_batched_migrations_on_schedule: true) allow(Gitlab::Database::BackgroundMigration::BatchedMigration).to receive(:active_migration) .with(connection: base_model.connection) @@ -292,7 +296,7 @@ RSpec.shared_examples 'it runs batched background migration jobs' do |tracking_d WHERE some_column = #{migration_records - 5}; SQL - stub_feature_flags(feature_flag => true) + stub_feature_flags(execute_batched_migrations_on_schedule: true) stub_const('Gitlab::BackgroundMigration::ExampleDataMigration', migration_class) end diff --git a/spec/workers/database/batched_background_migration/ci_database_worker_spec.rb b/spec/workers/database/batched_background_migration/ci_database_worker_spec.rb index f3cf5450048..2b4a42060d9 100644 --- a/spec/workers/database/batched_background_migration/ci_database_worker_spec.rb +++ b/spec/workers/database/batched_background_migration/ci_database_worker_spec.rb @@ -3,5 +3,5 @@ require 'spec_helper' RSpec.describe Database::BatchedBackgroundMigration::CiDatabaseWorker, :clean_gitlab_redis_shared_state do - it_behaves_like 'it runs batched background migration jobs', 'ci', feature_flag: :execute_batched_migrations_on_schedule_ci_database + it_behaves_like 'it runs batched background migration jobs', :ci end diff --git a/spec/workers/database/batched_background_migration_worker_spec.rb b/spec/workers/database/batched_background_migration_worker_spec.rb index 7f0883def3c..a6c7db60abe 100644 --- a/spec/workers/database/batched_background_migration_worker_spec.rb +++ b/spec/workers/database/batched_background_migration_worker_spec.rb @@ -3,5 +3,5 @@ require 'spec_helper' RSpec.describe Database::BatchedBackgroundMigrationWorker do - it_behaves_like 'it runs batched background migration jobs', :main, feature_flag: :execute_batched_migrations_on_schedule + it_behaves_like 'it runs batched background migration jobs', :main end