diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-02 22:57:52 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-02 22:57:52 +0300 |
| commit | f91c598db1bfae546441b87715180b9925a85264 (patch) | |
| tree | 2598f4a96bbfcd445d2b80bab462650c41ba875b | |
| parent | 662fcf93f33b06b180453a8ed65e6646f96a3351 (diff) | |
Add latest changes from gitlab-org/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" |