Automatic merge of gitlab-org/gitlab master

doc/.vale/gitlab/SubstitutionSuggestions.yml

@@ -6,15 +6,15 @@
 #
 # For a list of all options, see https://errata-ai.github.io/vale/styles/
 extends: substitution
-message: 'Consider "%s" instead of "%s".'
+message: 'Consider %s instead of "%s".'
 link: https://docs.gitlab.com/ee/development/documentation/styleguide.html#language
 level: suggestion
 ignorecase: true
 swap:
-  active user: billable user
-  active users: billable users
-  since: because
-  once that: after that
-  once the: after the
-  once you: after you
-  within: in
+  active user: '"billable user"'
+  active users: '"billable users"'
+  since: '"because" or "after"'
+  once that: '"after that"'
+  once the: '"after the"'
+  once you: '"after you"'
+  within: '"in"'

doc/api/graphql/reference/gitlab_schema.graphql

@@ -22506,7 +22506,7 @@ Autogenerated input type of UpdateBoard
 """
 input UpdateBoardInput {
   """
-  The id of user to be assigned to the board.
+  The id of user to be assigned to the board
   """
   assigneeId: UserID
 
@@ -22526,12 +22526,12 @@ input UpdateBoardInput {
   hideClosedList: Boolean
 
   """
-  The board global id.
+  The board global ID
   """
   id: BoardID!
 
   """
-  The IDs of labels to be added to the board.
+  The IDs of labels to be added to the board
   """
   labelIds: [LabelID!]
 
@@ -22541,7 +22541,7 @@ input UpdateBoardInput {
   labels: [String!]
 
   """
-  The id of milestone to be assigned to the board.
+  The id of milestone to be assigned to the board
   """
   milestoneId: MilestoneID
 
@@ -22551,7 +22551,7 @@ input UpdateBoardInput {
   name: String
 
   """
-  The weight value to be assigned to the board.
+  The weight value to be assigned to the board
   """
   weight: Int
 }
@@ -22606,7 +22606,7 @@ Autogenerated return type of UpdateBoard
 """
 type UpdateBoardPayload {
   """
-  The board after mutation.
+  The board after mutation
   """
   board: Board
 

doc/api/graphql/reference/gitlab_schema.json

@@ -65786,7 +65786,7 @@
           "inputFields": [
             {
               "name": "id",
-              "description": "The board global id.",
+              "description": "The board global ID",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
@@ -65830,7 +65830,7 @@
             },
             {
               "name": "assigneeId",
-              "description": "The id of user to be assigned to the board.",
+              "description": "The id of user to be assigned to the board",
               "type": {
                 "kind": "SCALAR",
                 "name": "UserID",
@@ -65840,7 +65840,7 @@
             },
             {
               "name": "milestoneId",
-              "description": "The id of milestone to be assigned to the board.",
+              "description": "The id of milestone to be assigned to the board",
               "type": {
                 "kind": "SCALAR",
                 "name": "MilestoneID",
@@ -65850,7 +65850,7 @@
             },
             {
               "name": "weight",
-              "description": "The weight value to be assigned to the board.",
+              "description": "The weight value to be assigned to the board",
               "type": {
                 "kind": "SCALAR",
                 "name": "Int",
@@ -65878,7 +65878,7 @@
             },
             {
               "name": "labelIds",
-              "description": "The IDs of labels to be added to the board.",
+              "description": "The IDs of labels to be added to the board",
               "type": {
                 "kind": "LIST",
                 "name": null,
@@ -66038,7 +66038,7 @@
           "fields": [
             {
               "name": "board",
-              "description": "The board after mutation.",
+              "description": "The board after mutation",
               "args": [
 
               ],

doc/api/graphql/reference/index.md

@@ -3425,7 +3425,7 @@ Autogenerated return type of UpdateBoard.
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| `board` | Board | The board after mutation. |
+| `board` | Board | The board after mutation |
 | `clientMutationId` | String | A unique identifier for the client performing the mutation. |
 | `errors` | String! => Array | Errors encountered during execution of the mutation. |
 

doc/topics/autodevops/index.md

@@ -38,11 +38,14 @@ For requirements, see [Requirements for Auto DevOps](requirements.md) for more i
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/41729) in GitLab 11.3.
 
-Auto DevOps is enabled by default for all projects and attempts to run on all pipelines
-in each project. An instance administrator can enable or disable this default in the
+On self-managed instances, Auto DevOps is enabled by default for all projects.
+It attempts to run on all pipelines in each project. An instance administrator can
+enable or disable this default in the
 [Auto DevOps settings](../../user/admin_area/settings/continuous_integration.md#auto-devops).
 Auto DevOps automatically disables in individual projects on their first pipeline failure,
-if it has not been explicitly enabled for the project.
+
+NOTE: **Note:**
+Auto DevOps is not enabled by default on GitLab.com.
 
 Since [GitLab 12.7](https://gitlab.com/gitlab-org/gitlab/-/issues/26655), Auto DevOps
 runs on pipelines automatically only if a [`Dockerfile` or matching buildpack](stages.md#auto-build)

ee/app/graphql/mutations/boards/update.rb

@@ -8,7 +8,7 @@ module Mutations
       argument :id,
                ::Types::GlobalIDType[::Board],
                required: true,
-               description: 'The board global id.'
+               description: 'The board global ID'
 
       argument :name,
                 GraphQL::STRING_TYPE,
@@ -29,17 +29,17 @@ module Mutations
                ::Types::GlobalIDType[::User],
                required: false,
                loads: ::Types::UserType,
-               description: 'The id of user to be assigned to the board.'
+               description: 'The id of user to be assigned to the board'
 
       argument :milestone_id,
                ::Types::GlobalIDType[::Milestone],
                required: false,
-               description: 'The id of milestone to be assigned to the board.'
+               description: 'The id of milestone to be assigned to the board'
 
       argument :weight,
                GraphQL::INT_TYPE,
                required: false,
-               description: 'The weight value to be assigned to the board.'
+               description: 'The weight value to be assigned to the board'
 
       argument :labels, [GraphQL::STRING_TYPE],
                required: false,
@@ -47,12 +47,12 @@ module Mutations
 
       argument :label_ids, [::Types::GlobalIDType[::Label]],
                required: false,
-               description: 'The IDs of labels to be added to the board.'
+               description: 'The IDs of labels to be added to the board'
 
       field :board,
             Types::BoardType,
             null: true,
-            description: "The board after mutation."
+            description: "The board after mutation"
 
       authorize :admin_board
 

spec/lib/gitlab/ci/config/entry/processable_spec.rb

@@ -361,7 +361,7 @@ RSpec.describe Gitlab::Ci::Config::Entry::Processable do
         context 'when root yaml variables are used' do
           let(:variables) do
             Gitlab::Ci::Config::Entry::Variables.new(
-              A: 'root', C: 'root', D: 'root'
+              { A: 'root', C: 'root', D: 'root' }
             ).value
           end
 

spec/lib/gitlab/config/entry/configurable_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe Gitlab::Config::Entry::Configurable do
 
   describe 'validations' do
     context 'when entry is a hash' do
-      let(:instance) { entry.new(key: 'value') }
+      let(:instance) { entry.new({ key: 'value' }) }
 
       it 'correctly validates an instance' do
         expect(instance).to be_valid