Add additional settings

Add squash options and merge method to scaffolder

Signed-off-by: Ken Liang <zliang@roku.com>
Signed-off-by: Zhi Liang <zliang@roku.com>

plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.ts

@@ -56,6 +56,8 @@ export function createPublishGitlabAction(options: {
       auto_devops_enabled?: boolean;
       ci_config_path?: string;
       description?: string;
+      merge_method?: 'merge' | 'rebase_merge' | 'ff';
+      squash_option?: 'default_off' | 'default_on' | 'never' | 'always';
       topics?: string[];
       visibility?: 'private' | 'internal' | 'public';
     };
@@ -169,6 +171,16 @@ export function createPublishGitlabAction(options: {
                 description: 'Short project description',
                 type: 'string',
               },
+              merge_method: {
+                title: 'Merge Method to use',
+                description: 'Merge Methods (merge, rebase_merge, ff)',
+                type: 'string',
+              },
+              squash_option: {
+                title: 'Squash option',
+                description: 'Set squash option for the project (never, always, default_on, default_off',
+                type: 'string',
+              },
               topics: {
                 title: 'Topic labels',
                 description: 'Topic labels to apply on the repository',