Expose squashCommitTemplate field in APIs

app/graphql/types/project_type.rb

@@ -386,6 +386,11 @@ module Types
           null: true,
           description: 'Template used to create merge commit message in merge requests.'
 
+    field :squash_commit_template,
+          GraphQL::Types::String,
+          null: true,
+          description: 'Template used to create squash commit message in merge requests.'
+
     def label(title:)
       BatchLoader::GraphQL.for(title).batch(key: project) do |titles, loader, args|
         LabelsFinder

doc/api/graphql/reference/index.md

@@ -12867,6 +12867,7 @@ Represents vulnerability finding of a security report on the pipeline.
 | <a id="projectservicedeskenabled"></a>`serviceDeskEnabled` | [`Boolean`](#boolean) | Indicates if the project has service desk enabled. |
 | <a id="projectsharedrunnersenabled"></a>`sharedRunnersEnabled` | [`Boolean`](#boolean) | Indicates if shared runners are enabled for the project. |
 | <a id="projectsnippetsenabled"></a>`snippetsEnabled` | [`Boolean`](#boolean) | Indicates if Snippets are enabled for the current user. |
+| <a id="projectsquashcommittemplate"></a>`squashCommitTemplate` | [`String`](#string) | Template used to create squash commit message in merge requests. |
 | <a id="projectsquashreadonly"></a>`squashReadOnly` | [`Boolean!`](#boolean) | Indicates if `squashReadOnly` is enabled. |
 | <a id="projectsshurltorepo"></a>`sshUrlToRepo` | [`String`](#string) | URL to connect to the project via SSH. |
 | <a id="projectstarcount"></a>`starCount` | [`Int!`](#int) | Number of times the project has been starred. |

doc/api/projects.md

@@ -183,6 +183,7 @@ When the user is authenticated and `simple` is not set this returns something li
     "autoclose_referenced_issues": true,
     "suggestion_commit_message": null,
     "merge_commit_template": null,
+    "squash_commit_template": null,
     "marked_for_deletion_at": "2020-04-03", // Deprecated and will be removed in API v5 in favor of marked_for_deletion_on
     "marked_for_deletion_on": "2020-04-03",
     "statistics": {
@@ -300,6 +301,7 @@ When the user is authenticated and `simple` is not set this returns something li
     "autoclose_referenced_issues": true,
     "suggestion_commit_message": null,
     "merge_commit_template": null,
+    "squash_commit_template": null,
     "statistics": {
       "commit_count": 12,
       "storage_size": 2066080,
@@ -470,6 +472,7 @@ GET /users/:user_id/projects
     "autoclose_referenced_issues": true,
     "suggestion_commit_message": null,
     "merge_commit_template": null,
+    "squash_commit_template": null,
     "marked_for_deletion_at": "2020-04-03", // Deprecated and will be removed in API v5 in favor of marked_for_deletion_on
     "marked_for_deletion_on": "2020-04-03",
     "statistics": {
@@ -587,6 +590,7 @@ GET /users/:user_id/projects
     "autoclose_referenced_issues": true,
     "suggestion_commit_message": null,
     "merge_commit_template": null,
+    "squash_commit_template": null,
     "statistics": {
       "commit_count": 12,
       "storage_size": 2066080,
@@ -714,6 +718,7 @@ Example response:
     "autoclose_referenced_issues": true,
     "suggestion_commit_message": null,
     "merge_commit_template": null,
+    "squash_commit_template": null,
     "statistics": {
       "commit_count": 37,
       "storage_size": 1038090,
@@ -826,6 +831,7 @@ Example response:
     "autoclose_referenced_issues": true,
     "suggestion_commit_message": null,
     "merge_commit_template": null,
+    "squash_commit_template": null,
     "statistics": {
       "commit_count": 12,
       "storage_size": 2066080,
@@ -994,6 +1000,7 @@ GET /projects/:id
   "autoclose_referenced_issues": true,
   "suggestion_commit_message": null,
   "merge_commit_template": null,
+  "squash_commit_template": null,
   "marked_for_deletion_at": "2020-04-03", // Deprecated and will be removed in API v5 in favor of marked_for_deletion_on
   "marked_for_deletion_on": "2020-04-03",
   "compliance_frameworks": [ "sox" ],
@@ -1307,6 +1314,7 @@ POST /projects/user/:user_id
 | `jobs_enabled`                                              | boolean | **{dotted-circle}** No | _(Deprecated)_ Enable jobs for this project. Use `builds_access_level` instead. |
 | `lfs_enabled`                                               | boolean | **{dotted-circle}** No | Enable LFS. |
 | `merge_commit_template`                                     | string  | **{dotted-circle}** No | [Template](../user/project/merge_requests/commit_templates.md) used to create merge commit message in merge requests. _([Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/20263) in GitLab 14.5.)_ |
+| `squash_commit_template`                                    | string  | **{dotted-circle}** No | [Template](../user/project/merge_requests/commit_templates.md#squash-commit-message-template) used to create squash commit message in merge requests. _([Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/345275) in GitLab 14.6.)_ |
 | `merge_method`                                              | string  | **{dotted-circle}** No | Set the [merge method](#project-merge-method) used. |
 | `merge_requests_access_level`                               | string  | **{dotted-circle}** No | One of `disabled`, `private`, or `enabled`. |
 | `merge_requests_enabled`                                    | boolean | **{dotted-circle}** No | _(Deprecated)_ Enable merge requests for this project. Use `merge_requests_access_level` instead. |

lib/api/entities/project.rb

@@ -115,6 +115,7 @@ module API
       expose :squash_option
       expose :suggestion_commit_message
       expose :merge_commit_template
+      expose :squash_commit_template
       expose :statistics, using: 'API::Entities::ProjectStatistics', if: -> (project, options) {
         options[:statistics] && Ability.allowed?(options[:current_user], :read_statistics, project)
       }

lib/api/helpers/projects_helpers.rb

@@ -62,6 +62,7 @@ module API
         optional :merge_method, type: String, values: %w(ff rebase_merge merge), desc: 'The merge method used when merging merge requests'
         optional :suggestion_commit_message, type: String, desc: 'The commit message used to apply merge request suggestions'
         optional :merge_commit_template, type: String, desc: 'Template used to create merge commit message'
+        optional :squash_commit_template, type: String, desc: 'Template used to create squash commit message'
         optional :initialize_with_readme, type: Boolean, desc: "Initialize a project with a README.md"
         optional :ci_default_git_depth, type: Integer, desc: 'Default number of revisions for shallow cloning'
         optional :auto_devops_enabled, type: Boolean, desc: 'Flag indication if Auto DevOps is enabled'
@@ -162,6 +163,7 @@ module API
           :avatar,
           :suggestion_commit_message,
           :merge_commit_template,
+          :squash_commit_template,
           :repository_storage,
           :compliance_framework_setting,
           :packages_enabled,

spec/graphql/types/project_type_spec.rb

@@ -34,7 +34,7 @@ RSpec.describe GitlabSchema.types['Project'] do
       container_repositories container_repositories_count
       pipeline_analytics squash_read_only sast_ci_configuration
       cluster_agent cluster_agents agent_configurations
-      ci_template timelogs merge_commit_template
+      ci_template timelogs merge_commit_template squash_commit_template
     ]
 
     expect(described_class).to include_graphql_fields(*expected_fields)