summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2019-02-25 11:36:30 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2019-02-25 11:36:30 +0000
commitc6b9ac860c654ec305c779ac1843e1d2ad096c31 (patch)
tree30e6af48ff7f25438572b24d95871628399f6c97 /lib
parenta15a0f3a2a8c65b96c74d2e9612495a4badaea8f (diff)
parent7ba89e4ac40afb4ed16865b0c3ac286217c2d64c (diff)
downloadgitlab-ce-c6b9ac860c654ec305c779ac1843e1d2ad096c31.tar.gz
Merge branch 'expose-merge-ref-to-runner' into 'master'
Expose refspec and depth to runner See merge request gitlab-org/gitlab-ce!25233
Diffstat (limited to 'lib')
-rw-r--r--lib/api/entities.rb10
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 9199f898ea0..7c035990fb0 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -1385,13 +1385,9 @@ module API
class GitInfo < Grape::Entity
expose :repo_url, :ref, :sha, :before_sha
- expose :ref_type do |model|
- if model.tag
- 'tag'
- else
- 'branch'
- end
- end
+ expose :ref_type
+ expose :refspecs
+ expose :git_depth, as: :depth
end
class RunnerInfo < Grape::Entity