summaryrefslogtreecommitdiff
path: root/lib/bitbucket_server/representation/pull_request.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-19 01:45:44 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-19 01:45:44 +0000
commit85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch)
tree9160f299afd8c80c038f08e1545be119f5e3f1e1 /lib/bitbucket_server/representation/pull_request.rb
parent15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff)
downloadgitlab-ce-85dc423f7090da0a52c73eb66faf22ddb20efff9.tar.gz
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'lib/bitbucket_server/representation/pull_request.rb')
-rw-r--r--lib/bitbucket_server/representation/pull_request.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/bitbucket_server/representation/pull_request.rb b/lib/bitbucket_server/representation/pull_request.rb
index c3e927d8de7..2f377bdced2 100644
--- a/lib/bitbucket_server/representation/pull_request.rb
+++ b/lib/bitbucket_server/representation/pull_request.rb
@@ -11,6 +11,12 @@ module BitbucketServer
raw.dig('author', 'user', 'emailAddress')
end
+ def author_username
+ raw.dig('author', 'user', 'username') ||
+ raw.dig('author', 'user', 'slug') ||
+ raw.dig('author', 'user', 'displayName')
+ end
+
def description
raw['description']
end