Merge branch 'rs-cherry-pick-api' into 'master'

Resolve possible cherry pick API race condition

Closes #53773

See merge request gitlab-org/gitlab-ce!22946

1 files changed, 5 insertions, 3 deletions

diff --git a/lib/api/commits.rb b/lib/api/commits.rb
index 1b228069005..3b8f3fedccf 100644
--- a/lib/api/commits.rb
+++ b/lib/api/commits.rb
@@ -194,11 +194,13 @@ module API
           branch_name: params[:branch]
         }
 
-        result = ::Commits::CherryPickService.new(user_project, current_user, commit_params).execute
+        result = ::Commits::CherryPickService
+          .new(user_project, current_user, commit_params)
+          .execute
 
         if result[:status] == :success
-          branch = find_branch!(params[:branch])
-          present user_project.repository.commit(branch.dereferenced_target), with: Entities::Commit
+          present user_project.repository.commit(result[:result]),
+            with: Entities::Commit
         else
           render_api_error!(result[:message], 400)
         end