Add latest changes from gitlab-org/gitlab@13-4-stable-ee

2 files changed, 9 insertions, 1 deletions

diff --git a/lib/bitbucket_server/representation/comment.rb b/lib/bitbucket_server/representation/comment.rb
index 99b97a3b181..7e55c446e76 100644
--- a/lib/bitbucket_server/representation/comment.rb
+++ b/lib/bitbucket_server/representation/comment.rb
@@ -38,7 +38,9 @@ module BitbucketServer
       end
 
       def author_username
-        author['displayName']
+        author['username'] ||
+          author['slug'] ||
+          author['displayName']
       end
 
       def author_email
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