Add latest changes from gitlab-org/gitlab@master

4 files changed, 8 insertions, 7 deletions

diff --git a/app/graphql/mutations/award_emojis/toggle.rb b/app/graphql/mutations/award_emojis/toggle.rb
index d822048f3a6..22eab4812a1 100644
--- a/app/graphql/mutations/award_emojis/toggle.rb
+++ b/app/graphql/mutations/award_emojis/toggle.rb
@@ -5,10 +5,9 @@ module Mutations
     class Toggle < Base
       graphql_name 'ToggleAwardEmoji'
 
-      field :toggledOn,
-            GraphQL::BOOLEAN_TYPE,
-            null: false,
-            description: 'True when the emoji was awarded, false when it was removed'
+      field :toggledOn, GraphQL::BOOLEAN_TYPE, null: false,
+            description: 'Indicates the status of the emoji. ' \
+            'True if the toggle awarded the emoji, and false if the toggle removed the emoji.'
 
       def resolve(args)
         awardable = authorized_find!(id: args[:awardable_id])
diff --git a/app/graphql/types/issue_type.rb b/app/graphql/types/issue_type.rb
index 4cbb849da3a..11850e5865f 100644
--- a/app/graphql/types/issue_type.rb
+++ b/app/graphql/types/issue_type.rb
@@ -69,7 +69,7 @@ module Types
     field :participants, Types::UserType.connection_type, null: true, complexity: 5,
           description: 'List of participants in the issue'
     field :subscribed, GraphQL::BOOLEAN_TYPE, method: :subscribed?, null: false, complexity: 5,
-          description: 'Boolean flag for whether the currently logged in user is subscribed to this issue'
+          description: 'Indicates the currently logged in user is subscribed to the issue'
     field :time_estimate, GraphQL::INT_TYPE, null: false,
           description: 'Time estimate of the issue'
     field :total_time_spent, GraphQL::INT_TYPE, null: false,
diff --git a/app/graphql/types/permission_types/base_permission_type.rb b/app/graphql/types/permission_types/base_permission_type.rb
index 73049ebed7b..deb8560bd79 100644
--- a/app/graphql/types/permission_types/base_permission_type.rb
+++ b/app/graphql/types/permission_types/base_permission_type.rb
@@ -25,7 +25,7 @@ module Types
         kword_args = kword_args.reverse_merge(
           name: name,
           type: GraphQL::BOOLEAN_TYPE,
-          description: "Whether or not a user can perform `#{name}` on this resource",
+          description: "Indicates the user can perform `#{name}` on this resource",
           null: false)
 
         field(**kword_args) # rubocop:disable Graphql/Descriptions
diff --git a/app/graphql/types/project_type.rb b/app/graphql/types/project_type.rb
index cd894f9775a..0bd2b0c81d9 100644
--- a/app/graphql/types/project_type.rb
+++ b/app/graphql/types/project_type.rb
@@ -46,7 +46,7 @@ module Types
           description: 'Timestamp of the project last activity'
 
     field :archived, GraphQL::BOOLEAN_TYPE, null: true,
-          description: 'Archived status of the project'
+          description: 'Indicates the archived status of the project'
 
     field :visibility, GraphQL::STRING_TYPE, null: true,
           description: 'Visibility of the project'
@@ -102,6 +102,8 @@ module Types
           description: 'Indicates if a link to create or view a merge request should display after a push to Git repositories of the project from the command line'
     field :remove_source_branch_after_merge, GraphQL::BOOLEAN_TYPE, null: true,
           description: 'Indicates if `Delete source branch` option should be enabled by default for all new merge requests of the project'
+    field :autoclose_referenced_issues, GraphQL::BOOLEAN_TYPE, null: true,
+          description: 'Indicates if issues referenced by merge requests and commits within the default branch are closed automatically'
 
     field :namespace, Types::NamespaceType, null: true,
           description: 'Namespace of the project'