From 9c3db830c033750c19197fe6a3f15a7705e2aa3b Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Tue, 23 Aug 2016 13:29:59 -0400
Subject: entities: expose {,merge_commit_}sha in MergeRequest

Fixes #20456.
---
 lib/api/entities.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib')

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
-- 
cgit v1.2.1