summaryrefslogtreecommitdiff
path: root/lib/bitbucket/representation
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-29 15:07:20 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-29 15:07:20 +0000
commitdee9315801b5dc49b795d13081086c22622a11ec (patch)
tree9582ec7c9aa89cee317b3c6398aac4e07897414a /lib/bitbucket/representation
parentd64e3a8b281d355c7d51d04df52fab407b8cc76d (diff)
downloadgitlab-ce-dee9315801b5dc49b795d13081086c22622a11ec.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/bitbucket/representation')
-rw-r--r--lib/bitbucket/representation/pull_request.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/bitbucket/representation/pull_request.rb b/lib/bitbucket/representation/pull_request.rb
index a498c9bc213..8d9de2dbc7d 100644
--- a/lib/bitbucket/representation/pull_request.rb
+++ b/lib/bitbucket/representation/pull_request.rb
@@ -16,9 +16,10 @@ module Bitbucket
end
def state
- if raw['state'] == 'MERGED'
+ case raw['state']
+ when 'MERGED'
'merged'
- elsif raw['state'] == 'DECLINED'
+ when 'DECLINED', 'SUPERSEDED'
'closed'
else
'opened'