diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-05 19:04:41 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-05 19:04:41 +0300 |
commit | 19da9d06b11949e6bcb55ea4dfd3c72e2bb8d12c (patch) | |
tree | 111541b50edb986029f334020cfb36a15e8235d7 | |
parent | 215b973326bde3d8de53e711a751a9b67202d5e6 (diff) |
Add latest changes from gitlab-org/security/gitlab@15-11-stable-ee
-rw-r--r-- | lib/bitbucket_server/representation/pull_request.rb | 1 | ||||
-rw-r--r-- | spec/lib/bitbucket_server/representation/pull_request_spec.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/bitbucket_server/representation/pull_request.rb b/lib/bitbucket_server/representation/pull_request.rb index 9a8eec67bd7..acbc44f6119 100644 --- a/lib/bitbucket_server/representation/pull_request.rb +++ b/lib/bitbucket_server/representation/pull_request.rb @@ -80,6 +80,7 @@ module BitbucketServer state: state, title: title, source_branch_name: source_branch_name, + source_branch_sha: source_branch_sha, target_branch_name: target_branch_name, target_branch_sha: target_branch_sha } diff --git a/spec/lib/bitbucket_server/representation/pull_request_spec.rb b/spec/lib/bitbucket_server/representation/pull_request_spec.rb index 5312bc1d71b..c5d0ee8908d 100644 --- a/spec/lib/bitbucket_server/representation/pull_request_spec.rb +++ b/spec/lib/bitbucket_server/representation/pull_request_spec.rb @@ -115,6 +115,7 @@ RSpec.describe BitbucketServer::Representation::PullRequest, feature_category: : author: "root", description: "Test", source_branch_name: "refs/heads/root/CODE_OF_CONDUCTmd-1530600625006", + source_branch_sha: "074e2b4dddc5b99df1bf9d4a3f66cfc15481fdc8", target_branch_name: "refs/heads/master", target_branch_sha: "839fa9a2d434eb697815b8fcafaecc51accfdbbc", title: "Added a new line" |