Automatic merge of gitlab-org/gitlab master

.gitignore

@@ -3,6 +3,7 @@
 *.mo
 *.edit.po
 *.rej
+.dir-locals.el
 .DS_Store
 .bundle
 .chef

.gitlab/issue_templates/Feature Flag Roll Out.md

@@ -38,6 +38,8 @@ Are there any other stages or teams involved that need to be kept in the loop?
 <!-- If applicable, any groups/projects that are happy to have this feature turned on early. Some organizations may wish to test big changes they are interested in with a small subset of users ahead of time for example. -->
 
 - `gitlab-org/gitlab` project
+- `gitlab-org/gitlab-foss` project
+- `gitlab-com/www-gitlab-com` project
 - `gitlab-org`/`gitlab-com` groups
 - ...
 
@@ -79,19 +81,24 @@ Are there any other stages or teams involved that need to be kept in the loop?
 - [ ] Ensure that documentation has been updated ([More info](https://docs.gitlab.com/ee/development/documentation/feature_flags.html#features-that-became-enabled-by-default)).
 - [ ] Announce on [the feature issue](ISSUE LINK) an estimated time this will be enabled on GitLab.com.
 - [ ] If the feature might impact the user experience, notify `#support_gitlab-com` and your team channel ([more guidance when this is necessary in the dev docs](https://docs.gitlab.com/ee/development/feature_flags/controls.html#communicate-the-change)).
-- [ ] If the feature flag in code has [an actor](https://docs.gitlab.com/ee/development/feature_flags/#feature-actors), enable it on GitLab.com for [testing groups/projects](#testing-groupsprojectsusers).
-    - [ ] `/chatops run feature set --<actor-type>=<actor> <feature-flag-name> true`
-- [ ] Verify that the feature works as expected. Posting the QA result in this issue is preferable.
 
 ### Global rollout on production
 
+All `/chatops` commands that target production should be done in the `#production` slack channel for visibility.
+
+- [ ] Confirm the feature flag is enabled on `staging` without incident
+- [ ] Roll out the feature to targeted testing projects/groups first
+    - [ ] `/chatops run feature set --project=gitlab-org/gitlab <feature-flag-name> true`
+    - [ ] `/chatops run feature set --project=gitlab-org/gitlab-foss <feature-flag-name> true`
+    - [ ] `/chatops run feature set --project=gitlab-com/www-gitlab-com <feature-flag-name> true`
+
 - [ ] [Incrementally roll out](https://docs.gitlab.com/ee/development/feature_flags/controls.html#process) the feature.
   - If the feature flag in code has [an actor](https://docs.gitlab.com/ee/development/feature_flags/#feature-actors), perform **actor-based** rollout.
     - [ ] `/chatops run feature set <feature-flag-name> <rollout-percentage> --actors`
   - If the feature flag in code does **NOT** have [an actor](https://docs.gitlab.com/ee/development/feature_flags/#feature-actors), perform time-based rollout (**random** rollout).
     - [ ] `/chatops run feature set <feature-flag-name> <rollout-percentage>`
-  - Enable the feature globally on production environment.
-    - [ ] `/chatops run feature set <feature-flag-name> true`
+- [ ] Verify the change has the desired outcome with the limited rollout before enabling the feature globally on production.
+- [ ] Enable the feature globally on production environment. `/chatops run feature set <feature-flag-name> true`
 - [ ] Announce on [the feature issue](ISSUE LINK) that the feature has been globally enabled.
 - [ ] Wait for [at least one day for the verification term](https://about.gitlab.com/handbook/product-development-flow/feature-flag-lifecycle/#including-a-feature-behind-feature-flag-in-the-final-release).
 

.rubocop_manual_todo.yml

@@ -23,30 +23,6 @@ Graphql/Descriptions:
     - 'ee/app/graphql/types/vulnerability_severity_enum.rb'
     - 'ee/app/graphql/types/vulnerability_state_enum.rb'
     - 'ee/app/graphql/types/vulnerability_confidence_enum.rb'
-    - 'app/graphql/types/design_management/design_at_version_type.rb'
-    - 'app/graphql/types/design_management/design_fields.rb'
-    - 'app/graphql/types/diff_paths_input_type.rb'
-    - 'app/graphql/types/environment_type.rb'
-    - 'app/graphql/types/eventable_type.rb'
-    - 'app/graphql/types/group_type.rb'
-    - 'app/graphql/types/merge_request_type.rb'
-    - 'app/graphql/types/metadata/kas_type.rb'
-    - 'app/graphql/types/milestone_wildcard_id_enum.rb'
-    - 'app/graphql/types/namespace_type.rb'
-    - 'app/graphql/types/notes/note_type.rb'
-    - 'app/graphql/types/notes/position_type_enum.rb'
-    - 'app/graphql/types/packages/composer/json_type.rb'
-    - 'app/graphql/types/packages/package_details_type.rb'
-    - 'app/graphql/types/packages/package_file_type.rb'
-    - 'app/graphql/types/packages/package_tag_type.rb'
-    - 'app/graphql/types/packages/package_type.rb'
-    - 'app/graphql/types/project_type.rb'
-    - 'app/graphql/types/prometheus_alert_type.rb'
-    - 'app/graphql/types/query_type.rb'
-    - 'app/graphql/types/range_input_type.rb'
-    - 'app/graphql/types/release_asset_link_shared_input_arguments.rb'
-    - 'app/graphql/types/release_assets_input_type.rb'
-    - 'app/graphql/types/release_type.rb'
     - 'app/graphql/types/repository/blob_type.rb'
     - 'app/graphql/types/root_storage_statistics_type.rb'
     - 'app/graphql/types/snippet_type.rb'

Gemfile

@@ -310,7 +310,7 @@ gem 'pg_query', '~> 2.1'
 gem 'premailer-rails', '~> 1.10.3'
 
 # LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '~> 0.21.0'
+gem 'gitlab-labkit', '~> 0.21.1'
 # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
 # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
 gem 'thrift', '>= 0.14.0'
@@ -479,7 +479,7 @@ gem 'gitaly', '~> 14.2.0.pre.rc2'
 # KAS GRPC protocol definitions
 gem 'kas-grpc', '~> 0.0.2'
 
-gem 'grpc', '~> 1.38.0'
+gem 'grpc', '~> 1.30.2'
 
 gem 'google-protobuf', '~> 3.17.1'
 

Gemfile.lock

@@ -475,10 +475,10 @@ GEM
       fog-json (~> 1.2.0)
       mime-types
       ms_rest_azure (~> 0.12.0)
-    gitlab-labkit (0.21.0)
+    gitlab-labkit (0.21.1)
       actionpack (>= 5.0.0, < 7.0.0)
       activesupport (>= 5.0.0, < 7.0.0)
-      grpc (~> 1.38)
+      grpc (~> 1.30.2)
       jaeger-client (~> 1.1)
       opentracing (~> 0.4)
       pg_query (~> 2.1)
@@ -573,8 +573,8 @@ GEM
       graphql (~> 1.6)
       html-pipeline (~> 2.8)
       sass (~> 3.4)
-    grpc (1.38.0)
-      google-protobuf (~> 3.15)
+    grpc (1.30.2)
+      google-protobuf (~> 3.12)
       googleapis-common-protos-types (~> 1.0)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
@@ -1477,7 +1477,7 @@ DEPENDENCIES
   gitlab-dangerfiles (~> 2.3.0)
   gitlab-experiment (~> 0.6.4)
   gitlab-fog-azure-rm (~> 1.1.1)
-  gitlab-labkit (~> 0.21.0)
+  gitlab-labkit (~> 0.21.1)
   gitlab-license (~> 2.0)
   gitlab-mail_room (~> 0.0.9)
   gitlab-markup (~> 1.7.1)
@@ -1499,7 +1499,7 @@ DEPENDENCIES
   graphlient (~> 0.4.0)
   graphql (~> 1.11.8)
   graphql-docs (~> 1.6.0)
-  grpc (~> 1.38.0)
+  grpc (~> 1.30.2)
   gssapi
   guard-rspec
   haml_lint (~> 0.36.0)

app/graphql/types/design_management/design_at_version_type.rb

@@ -18,12 +18,12 @@ module Types
       field :version,
             Types::DesignManagement::VersionType,
             null: false,
-            description: 'The version this design-at-versions is pinned to.'
+            description: 'Version this design-at-versions is pinned to.'
 
       field :design,
             Types::DesignManagement::DesignType,
             null: false,
-            description: 'The underlying design.'
+            description: 'Underlying design.'
 
       def cached_stateful_version(_parent)
         version

app/graphql/types/design_management/design_fields.rb

@@ -7,12 +7,12 @@ module Types
 
       field_class Types::BaseField
 
-      field :id, GraphQL::Types::ID, description: 'The ID of this design.', null: false
-      field :project, Types::ProjectType, null: false, description: 'The project the design belongs to.'
-      field :issue, Types::IssueType, null: false, description: 'The issue the design belongs to.'
-      field :filename, GraphQL::Types::String, null: false, description: 'The filename of the design.'
-      field :full_path, GraphQL::Types::String, null: false, description: 'The full path to the design file.'
-      field :image, GraphQL::Types::String, null: false, extras: [:parent], description: 'The URL of the full-sized image.'
+      field :id, GraphQL::Types::ID, description: 'ID of this design.', null: false
+      field :project, Types::ProjectType, null: false, description: 'Project the design belongs to.'
+      field :issue, Types::IssueType, null: false, description: 'Issue the design belongs to.'
+      field :filename, GraphQL::Types::String, null: false, description: 'Filename of the design.'
+      field :full_path, GraphQL::Types::String, null: false, description: 'Full path to the design file.'
+      field :image, GraphQL::Types::String, null: false, extras: [:parent], description: 'URL of the full-sized image.'
       field :image_v432x230, GraphQL::Types::String, null: true, extras: [:parent],
             description: 'The URL of the design resized to fit within the bounds of 432x230. ' \
                          'This will be `null` if the image has not been generated'
@@ -20,7 +20,7 @@ module Types
             null: false,
             calls_gitaly: true,
             extras: [:parent],
-            description: 'The diff refs for this design.'
+            description: 'Diff refs for this design.'
       field :event, Types::DesignManagement::DesignVersionEventEnum,
             null: false,
             extras: [:parent],
@@ -29,7 +29,7 @@ module Types
             GraphQL::Types::Int,
             null: false,
             method: :user_notes_count,
-            description: 'The total count of user-created notes for this design.'
+            description: 'Total count of user-created notes for this design.'
 
       def diff_refs(parent:)
         version = cached_stateful_version(parent)

app/graphql/types/diff_paths_input_type.rb

@@ -3,8 +3,8 @@
 module Types
   class DiffPathsInputType < BaseInputObject
     argument :old_path, GraphQL::Types::String, required: false,
-              description: 'The path of the file on the start sha.'
+              description: 'Path of the file on the start SHA.'
     argument :new_path, GraphQL::Types::String, required: false,
-              description: 'The path of the file on the head sha.'
+              description: 'Path of the file on the HEAD SHA.'
   end
 end

app/graphql/types/environment_type.rb

@@ -19,7 +19,7 @@ module Types
           description: 'State of the environment, for example: available/stopped.'
 
     field :path, GraphQL::Types::String, null: false,
-          description: 'The path to the environment.'
+          description: 'Path to the environment.'
 
     field :metrics_dashboard, Types::Metrics::DashboardType, null: true,
           description: 'Metrics dashboard schema for the environment.',
@@ -28,6 +28,6 @@ module Types
     field :latest_opened_most_severe_alert,
           Types::AlertManagement::AlertType,
           null: true,
-          description: 'The most severe open alert for the environment. If multiple alerts have equal severity, the most recent is returned.'
+          description: 'Most severe open alert for the environment. If multiple alerts have equal severity, the most recent is returned.'
   end
 end

app/graphql/types/eventable_type.rb

@@ -4,6 +4,6 @@ module Types
   module EventableType
     include Types::BaseInterface
 
-    field :events, Types::EventType.connection_type, null: true, description: 'A list of events associated with the object.'
+    field :events, Types::EventType.connection_type, null: true, description: 'List of events associated with the object.'
   end
 end

app/graphql/types/group_type.rb

@@ -33,12 +33,12 @@ module Types
           type: GraphQL::Types::String,
           null: true,
           method: :project_creation_level_str,
-          description: 'The permission level required to create projects in the group.'
+          description: 'Permission level required to create projects in the group.'
     field :subgroup_creation_level,
           type: GraphQL::Types::String,
           null: true,
           method: :subgroup_creation_level_str,
-          description: 'The permission level required to create subgroups within the group.'
+          description: 'Permission level required to create subgroups within the group.'
 
     field :require_two_factor_authentication,
           type: GraphQL::Types::Boolean,
@@ -101,7 +101,7 @@ module Types
     field :label,
           Types::LabelType,
           null: true,
-          description: 'A label available on this group.' do
+          description: 'Label available on this group.' do
             argument :title,
                      type: GraphQL::Types::String,
                      required: true,

app/graphql/types/merge_request_type.rb

@@ -64,7 +64,7 @@ module Types
           description: 'Diff head SHA of the merge request.'
     field :diff_stats, [Types::DiffStatsType], null: true, calls_gitaly: true,
           description: 'Details about which files were changed in this merge request.' do
-      argument :path, GraphQL::Types::String, required: false, description: 'A specific file-path.'
+      argument :path, GraphQL::Types::String, required: false, description: 'Specific file path.'
     end
 
     field :diff_stats_summary, Types::DiffStatsSummaryType, null: true, calls_gitaly: true,
@@ -129,14 +129,14 @@ module Types
           description: 'Number of downvotes for the merge request.'
 
     field :head_pipeline, Types::Ci::PipelineType, null: true, method: :actual_head_pipeline,
-          description: 'The pipeline running on the branch HEAD of the merge request.'
+          description: 'Pipeline running on the branch HEAD of the merge request.'
     field :pipelines,
           null: true,
           description: 'Pipelines for the merge request. Note: for performance reasons, no more than the most recent 500 pipelines will be returned.',
           resolver: Resolvers::MergeRequestPipelinesResolver
 
     field :milestone, Types::MilestoneType, null: true,
-          description: 'The milestone of the merge request.'
+          description: 'Milestone of the merge request.'
     field :assignees,
           type: Types::MergeRequests::AssigneeType.connection_type,
           null: true,

app/graphql/types/metadata/kas_type.rb

@@ -12,7 +12,7 @@ module Types
       field :version, GraphQL::Types::String, null: true,
             description: 'KAS version.'
       field :external_url, GraphQL::Types::String, null: true,
-            description: 'The URL used by the Agents to communicate with KAS.'
+            description: 'URL used by the Agents to communicate with KAS.'
     end
   end
 end

app/graphql/types/milestone_wildcard_id_enum.rb

@@ -6,7 +6,7 @@ module Types
     description 'Milestone ID wildcard values'
 
     value 'NONE', 'No milestone is assigned.'
-    value 'ANY', 'A milestone is assigned.'
+    value 'ANY', 'Milestone is assigned.'
     value 'STARTED', 'An open, started milestone (start date <= today).'
     value 'UPCOMING', 'An open milestone due in the future (due date >= today).'
   end

app/graphql/types/namespace_type.rb

@@ -40,7 +40,7 @@ module Types
     field :package_settings,
           Types::Namespace::PackageSettingsType,
           null: true,
-          description: 'The package settings for the namespace.'
+          description: 'Package settings for the namespace.'
 
     field :shared_runners_setting,
           Types::Namespace::SharedRunnersSettingEnum,

app/graphql/types/notes/note_type.rb

@@ -40,9 +40,9 @@ module Types
       field :updated_at, Types::TimeType, null: false,
             description: "Timestamp of the note's last activity."
       field :discussion, Types::Notes::DiscussionType, null: true,
-            description: 'The discussion this note is a part of.'
+            description: 'Discussion this note is a part of.'
       field :position, Types::Notes::DiffPositionType, null: true,
-            description: 'The position of this note on a diff.'
+            description: 'Position of this note on a diff.'
       field :confidential, GraphQL::Types::Boolean, null: true,
             description: 'Indicates if this note is confidential.',
             method: :confidential?

app/graphql/types/notes/position_type_enum.rb

@@ -6,7 +6,7 @@ module Types
       graphql_name 'DiffPositionType'
       description 'Type of file the position refers to'
 
-      value 'text', description: "A text file."
+      value 'text', description: "Text file."
       value 'image', description: "An image."
     end
   end

app/graphql/types/packages/composer/json_type.rb

@@ -8,10 +8,10 @@ module Types
         graphql_name 'PackageComposerJsonType'
         description 'Represents a composer JSON file'
 
-        field :name, GraphQL::Types::String, null: true, description: 'The name set in the Composer JSON file.'
-        field :type, GraphQL::Types::String, null: true, description: 'The type set in the Composer JSON file.'
-        field :license, GraphQL::Types::String, null: true, description: 'The license set in the Composer JSON file.'
-        field :version, GraphQL::Types::String, null: true, description: 'The version set in the Composer JSON file.'
+        field :name, GraphQL::Types::String, null: true, description: 'Name set in the Composer JSON file.'
+        field :type, GraphQL::Types::String, null: true, description: 'Type set in the Composer JSON file.'
+        field :license, GraphQL::Types::String, null: true, description: 'License set in the Composer JSON file.'
+        field :version, GraphQL::Types::String, null: true, description: 'Version set in the Composer JSON file.'
       end
     end
   end

app/graphql/types/packages/package_details_type.rb

@@ -8,7 +8,7 @@ module Types
       authorize :read_package
 
       field :versions, ::Types::Packages::PackageType.connection_type, null: true,
-        description: 'The other versions of the package.'
+        description: 'Other versions of the package.'
 
       field :package_files, Types::Packages::PackageFileType.connection_type, null: true, description: 'Package files.'
 

app/graphql/types/packages/package_file_type.rb

@@ -8,8 +8,8 @@ module Types
       authorize :read_package
 
       field :id, ::Types::GlobalIDType[::Packages::PackageFile], null: false, description: 'ID of the file.'
-      field :created_at, Types::TimeType, null: false, description: 'The created date.'
-      field :updated_at, Types::TimeType, null: false, description: 'The updated date.'
+      field :created_at, Types::TimeType, null: false, description: 'Created date.'
+      field :updated_at, Types::TimeType, null: false, description: 'Updated date.'
       field :size, GraphQL::Types::String, null: false, description: 'Size of the package file.'
       field :file_name, GraphQL::Types::String, null: false, description: 'Name of the package file.'
       field :download_path, GraphQL::Types::String, null: false, description: 'Download path of the package file.'

app/graphql/types/packages/package_tag_type.rb

@@ -7,10 +7,10 @@ module Types
       description 'Represents a package tag'
       authorize :read_package
 
-      field :id, GraphQL::Types::ID, null: false, description: 'The ID of the tag.'
-      field :name, GraphQL::Types::String, null: false, description: 'The name of the tag.'
-      field :created_at, Types::TimeType, null: false, description: 'The created date.'
-      field :updated_at, Types::TimeType, null: false, description: 'The updated date.'
+      field :id, GraphQL::Types::ID, null: false, description: 'ID of the tag.'
+      field :name, GraphQL::Types::String, null: false, description: 'Name of the tag.'
+      field :created_at, Types::TimeType, null: false, description: 'Created date.'
+      field :updated_at, Types::TimeType, null: false, description: 'Updated date.'
     end
   end
 end

app/graphql/types/packages/package_type.rb

@@ -23,7 +23,7 @@ module Types
       field :metadata, Types::Packages::MetadataType, null: true,
         description: 'Package metadata.'
       field :versions, ::Types::Packages::PackageType.connection_type, null: true,
-        description: 'The other versions of the package.',
+        description: 'Other versions of the package.',
         deprecated: { reason: 'This field is now only returned in the PackageDetailsType', milestone: '13.11' }
       field :status, Types::Packages::PackageStatusEnum, null: false, description: 'Package status.'
 

app/graphql/types/project_type.rb

@@ -118,7 +118,7 @@ module Types
     field :autoclose_referenced_issues, GraphQL::Types::Boolean, null: true,
           description: 'Indicates if issues referenced by merge requests and commits within the default branch are closed automatically.'
     field :suggestion_commit_message, GraphQL::Types::String, null: true,
-          description: 'The commit message used to apply merge request suggestions.'
+          description: 'Commit message used to apply merge request suggestions.'
     field :squash_read_only, GraphQL::Types::Boolean, null: false, method: :squash_readonly?,
           description: 'Indicates if `squashReadOnly` is enabled.'
 
@@ -310,7 +310,7 @@ module Types
     field :container_expiration_policy,
           Types::ContainerExpirationPolicyType,
           null: true,
-          description: 'The container expiration policy of the project.'
+          description: 'Container expiration policy of the project.'
 
     field :container_repositories,
           Types::ContainerRepositoryType.connection_type,
@@ -324,7 +324,7 @@ module Types
     field :label,
           Types::LabelType,
           null: true,
-          description: 'A label available on this project.' do
+          description: 'Label available on this project.' do
             argument :title, GraphQL::Types::String,
               required: true,
               description: 'Title of the label.'

app/graphql/types/prometheus_alert_type.rb

@@ -15,6 +15,6 @@ module Types
     field :humanized_text,
           GraphQL::Types::String,
           null: false,
-          description: 'The human-readable text of the alert condition.'
+          description: 'Human-readable text of the alert condition.'
   end
 end

app/graphql/types/query_type.rb

@@ -62,7 +62,7 @@ module Types
             argument :id,
                      type: ::Types::GlobalIDType[::ContainerRepository],
                      required: true,
-                     description: 'The global ID of the container repository.'
+                     description: 'Global ID of the container repository.'
           end
 
     field :package,
@@ -84,13 +84,13 @@ module Types
     field :issue, Types::IssueType,
           null: true,
           description: 'Find an issue.' do
-            argument :id, ::Types::GlobalIDType[::Issue], required: true, description: 'The global ID of the issue.'
+            argument :id, ::Types::GlobalIDType[::Issue], required: true, description: 'Global ID of the issue.'
           end
 
     field :merge_request, Types::MergeRequestType,
           null: true,
           description: 'Find a merge request.' do
-            argument :id, ::Types::GlobalIDType[::MergeRequest], required: true, description: 'The global ID of the merge request.'
+            argument :id, ::Types::GlobalIDType[::MergeRequest], required: true, description: 'Global ID of the merge request.'
           end
 
     field :instance_statistics_measurements,

app/graphql/types/range_input_type.rb

@@ -8,11 +8,11 @@ module Types
       @subtypes[[type, closed]] ||= Class.new(self) do
         argument :start, type,
                  required: closed,
-                 description: 'The start of the range.'
+                 description: 'Start of the range.'
 
         argument :end, type,
                  required: closed,
-                 description: 'The end of the range.'
+                 description: 'End of the range.'
       end
     end
 

app/graphql/types/release_asset_link_shared_input_arguments.rb

@@ -19,7 +19,7 @@ module Types
 
       argument :link_type, Types::ReleaseAssetLinkTypeEnum,
              required: false, default_value: 'other',
-             description: 'The type of the asset link.'
+             description: 'Type of the asset link.'
     end
   end
 end

app/graphql/types/release_assets_input_type.rb

@@ -7,6 +7,6 @@ module Types
 
     argument :links, [Types::ReleaseAssetLinkInputType],
              required: false,
-             description: 'A list of asset links to associate to the release.'
+             description: 'List of asset links to associate to the release.'
   end
 end

app/graphql/types/release_type.rb

@@ -49,7 +49,7 @@ module Types
 
     field :commit, Types::CommitType, null: true,
           complexity: 10, calls_gitaly: true,
-          description: 'The commit associated with the release.'
+          description: 'Commit associated with the release.'
 
     def commit
       return if release.sha.nil?

doc/.vale/gitlab/spelling-exceptions.txt

@@ -209,6 +209,7 @@ fixup
 Flawfinder
 Flowdock
 Fluentd
+Flycheck
 Forgerock
 formatters
 Fugit

doc/development/documentation/testing.md

@@ -319,6 +319,38 @@ To configure Vale in your editor, install one of the following as appropriate:
     cases, `vale` should work. To find the location, run `which vale` in a terminal.
 
 - Vim [ALE plugin](https://github.com/dense-analysis/ale).
+- Emacs [Flycheck extension](https://github.com/flycheck/flycheck).
+  This requires some configuration:
+
+  - `Flycheck` supports `markdownlint-cli` out of the box, but you must point it
+  to the `.markdownlint.yml` at the base of the project directory. A `.dir-locals.el`
+  file can accomplish this:
+
+  ```lisp
+  ;; Place this code in a file called `.dir-locals.el` at the root of the gitlab project.
+  ((markdown-mode . ((flycheck-markdown-markdownlint-cli-config . ".markdownlint.yml"))))
+
+  ```
+
+  - A minimal configuration for Flycheck to work with Vale could look like this:
+
+  ```lisp
+  (flycheck-define-checker vale
+    "A checker for prose"
+    :command ("vale" "--output" "line" "--no-wrap"
+              source)
+    :standard-input nil
+    :error-patterns
+      ((error line-start (file-name) ":" line ":" column ":" (id (one-or-more (not (any ":")))) ":" (message)   line-end))
+    :modes (markdown-mode org-mode text-mode)
+    :next-checkers ((t . markdown-markdownlint-cli))
+  )
+
+  (add-to-list 'flycheck-checkers 'vale)
+  ```
+
+  In this setup the `markdownlint` checker is set as a "next" checker from the defined `vale` checker.
+  Enabling this custom Vale checker provides error linting from both Vale and markdownlint.
 
 We don't use [Vale Server](https://errata-ai.github.io/vale/#using-vale-with-a-text-editor-or-another-third-party-application).
 

doc/update/index.md

@@ -182,7 +182,7 @@ Find where your version sits in the upgrade path below, and upgrade GitLab
 accordingly, while also consulting the
 [version-specific upgrade instructions](#version-specific-upgrading-instructions):
 
-`8.11.Z` -> [`8.12.0`](#upgrades-from-versions-earlier-than-812) -> `8.17.7` -> `9.5.10` -> `10.8.7` -> [`11.11.8`](#1200) -> `12.0.12` -> [`12.1.17`](#1210) -> `12.10.14` -> `13.0.14` -> [`13.1.11`](#1310) -> [latest `13.12.Z`](https://about.gitlab.com/releases/categories/releases/) -> [latest `14.0.Z`](#1400) -> [`14.1.Z`](#1410) -> [latest `14.Y.Z`](https://about.gitlab.com/releases/categories/releases/)
+`8.11.Z` -> [`8.12.0`](#upgrades-from-versions-earlier-than-812) -> `8.17.7` -> `9.5.10` -> `10.8.7` -> [`11.11.8`](#1200) -> `12.0.12` -> [`12.1.17`](#1210) -> `12.10.14` -> `13.0.14` -> [`13.1.11`](#1310) -> [`13.8.3`](#1383) -> [latest `13.12.Z`](https://about.gitlab.com/releases/categories/releases/) -> [latest `14.0.Z`](#1400) -> [`14.1.Z`](#1410) -> [latest `14.Y.Z`](https://about.gitlab.com/releases/categories/releases/)
 
 The following table, while not exhaustive, shows some examples of the supported
 upgrade paths.
@@ -190,7 +190,7 @@ upgrade paths.
 | Target version | Your version | Supported upgrade path                                                                               | Note                                                                                                                              |
 | -------------- | ------------ | ---------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
 | `14.1.2`       | `13.9.2`     | `13.9.2` -> `13.12.9` -> `14.0.7` -> `14.1.2`                                                        | Two intermediate versions are required: `13.12` and `14.0`, then `14.1`.                                                          |
-| `13.5.4`       | `12.9.2`     | `12.9.2` -> `12.10.14` -> `13.0.14`  -> `13.1.11` -> `13.5.4`                                        | Three intermediate versions are required: `12.10`, `13.0` and `13.1`, then `13.5.4`.                                              |
+| `13.12.10`     | `12.9.2`     | `12.9.2` -> `12.10.14` -> `13.0.14`  -> `13.1.11` -> `13.8.3` -> `13.12.10`                          | Four intermediate versions are required: `12.10`, `13.0`, `13.1` and `13.8.3`, then `13.12.10`.                               |
 | `13.2.10`      | `11.5.0`     | `11.5.0` -> `11.11.8` -> `12.0.12` -> `12.1.17` -> `12.10.14` -> `13.0.14` -> `13.1.11` -> `13.2.10` | Six intermediate versions are required: `11.11`, `12.0`, `12.1`, `12.10`, `13.0` and `13.1`, then `13.2.10`.                      |
 | `12.10.14`     | `11.3.4`     | `11.3.4` -> `11.11.8` -> `12.0.12` -> `12.1.17` -> `12.10.14`                                        | Three intermediate versions are required: `11.11`, `12.0` and `12.1`, then `12.10.14`.                                            |
 | `12.9.5`       | `10.4.5`     | `10.4.5` -> `10.8.7` -> `11.11.8` -> `12.0.12` -> `12.1.17` -> `12.9.5`                              | Four intermediate versions are required: `10.8`, `11.11`, `12.0` and `12.1`, then `12.9.5`.                                       |
@@ -480,6 +480,17 @@ DETAIL: trigger trigger_0d588df444c8 on table application_settings depends on co
 To work around this bug, follow the previous steps to complete the update.
 More details are available [in this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/324160).
 
+### 13.8.3
+
+GitLab 13.8 includes a background migration to address [an issue with duplicate service records](https://gitlab.com/gitlab-org/gitlab/-/issues/290008). If duplicate services are present, this background migration must complete before a unique index is applied to the services table, which was [introduced in GitLab 13.9](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52563). Upgrades from GitLab 13.8 and earlier to later versions must include an intermediate upgrade to GitLab 13.8.3 and [must wait until the background migrations complete](#checking-for-background-migrations-before-upgrading) before proceeding.
+
+If duplicate services are still present, an upgrade to 13.9.x or later results in a failed upgrade with the following error:
+
+```console
+PG::UniqueViolation: ERROR:  could not create unique index "index_services_on_project_id_and_type_unique"
+DETAIL:  Key (project_id, type)=(NNN, ServiceName) is duplicated.
+```
+
 ### 13.6.0
 
 Ruby 2.7.2 is required. GitLab does not start with Ruby 2.6.6 or older versions.

spec/deprecation_toolkit_env.rb

@@ -56,8 +56,12 @@ module DeprecationToolkitEnv
   # In this case, we recommend to add a silence together with an issue to patch or update
   # the dependency causing the problem.
   # See https://gitlab.com/gitlab-org/gitlab/-/commit/aea37f506bbe036378998916d374966c031bf347#note_647515736
+  #
+  # - ruby/lib/grpc/generic/interceptors.rb: https://gitlab.com/gitlab-org/gitlab/-/issues/339305
   def self.allowed_kwarg_warning_paths
-    %w[]
+    %w[
+        ruby/lib/grpc/generic/interceptors.rb
+      ]
   end
 
   def self.configure!

spec/tooling/graphql/docs/renderer_spec.rb

@@ -535,8 +535,8 @@ RSpec.describe Tooling::Graphql::Docs::Renderer do
 
           | Name | Type | Description |
           | ---- | ---- | ----------- |
-          | <a id="timeframeend"></a>`end` | [`Date!`](#date) | The end of the range. |
-          | <a id="timeframestart"></a>`start` | [`Date!`](#date) | The start of the range. |
+          | <a id="timeframeend"></a>`end` | [`Date!`](#date) | End of the range. |
+          | <a id="timeframestart"></a>`start` | [`Date!`](#date) | Start of the range. |
         DOC
       end