summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2016-08-23 13:29:59 -0400
committerBen Boeckel <ben.boeckel@kitware.com>2016-08-31 10:50:54 -0400
commit9c3db830c033750c19197fe6a3f15a7705e2aa3b (patch)
tree764c9ca94464ea1631d0deab8767cca1361de5cb /lib
parenta181d675540d9ae571443cd9e19982af73be1ea4 (diff)
downloadgitlab-ce-9c3db830c033750c19197fe6a3f15a7705e2aa3b.tar.gz
entities: expose {,merge_commit_}sha in MergeRequest
Fixes #20456.
Diffstat (limited to 'lib')
-rw-r--r--lib/api/entities.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 4335e3055ef..3b05f0487ff 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -232,6 +232,8 @@ module API
expose :milestone, using: Entities::Milestone
expose :merge_when_build_succeeds
expose :merge_status
+ expose :diff_head_sha, as: :sha
+ expose :merge_commit_sha
expose :subscribed do |merge_request, options|
merge_request.subscribed?(options[:current_user])
end