summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-12-31 10:28:55 +0900
committerShinya Maeda <shinya@gitlab.com>2018-12-31 10:28:55 +0900
commite5259c6f9129055fd91324351e258d3a3cf0117e (patch)
tree8e2f79cf231a369171aeff75ef0824ff0bc5645e /lib/api/entities.rb
parentbd268a1e0924ce912ef8bf13373820640b5b53c0 (diff)
downloadgitlab-ce-poc-runner-checkout-merge-ref.tar.gz
Poc runner checkout merge refpoc-runner-checkout-merge-ref
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r--lib/api/entities.rb11
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 22403664c21..2472eb72b85 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -1312,12 +1312,19 @@ module API
class GitInfo < Grape::Entity
expose :repo_url, :ref, :sha, :before_sha
expose :ref_type do |model|
- if model.tag
+ if model.pipeline.branch?
+ 'branch'
+ elsif model.pipeline.merge_request?
+ 'merge-requests'
+ elsif model.pipeline.tag?
'tag'
else
- 'branch'
+ raise ArgumentError, 'Invalid ref type!'
end
end
+ expose :merge_request_iid, if: ->(job, _) { job.pipeline.merge_request? } do
+ job.pipeline.merge_request.iid
+ end
end
class RunnerInfo < Grape::Entity