Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

1 files changed, 7 insertions, 3 deletions

diff --git a/app/graphql/mutations/commits/create.rb b/app/graphql/mutations/commits/create.rb
index 9ed1bb819c8..2b9107350fd 100644
--- a/app/graphql/mutations/commits/create.rb
+++ b/app/graphql/mutations/commits/create.rb
@@ -13,7 +13,11 @@ module Mutations
 
       argument :branch, GraphQL::STRING_TYPE,
                required: true,
-               description: 'Name of the branch'
+               description: 'Name of the branch to commit into, it can be a new branch'
+
+      argument :start_branch, GraphQL::STRING_TYPE,
+               required: false,
+               description: 'If on a new branch, name of the original branch'
 
       argument :message,
                GraphQL::STRING_TYPE,
@@ -32,13 +36,13 @@ module Mutations
 
       authorize :push_code
 
-      def resolve(project_path:, branch:, message:, actions:)
+      def resolve(project_path:, branch:, message:, actions:, **args)
         project = authorized_find!(full_path: project_path)
 
         attributes = {
           commit_message: message,
           branch_name: branch,
-          start_branch: branch,
+          start_branch: args[:start_branch] || branch,
           actions: actions.map { |action| action.to_h }
         }