From 3063225ca289e87c3f590e1722451a1c674e2ac9 Mon Sep 17 00:00:00 2001 From: Oswaldo Ferreira Date: Thu, 3 May 2018 17:28:00 -0300 Subject: Display merge commit SHA in merge widget after merge --- app/serializers/merge_request_widget_entity.rb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'app/serializers/merge_request_widget_entity.rb') diff --git a/app/serializers/merge_request_widget_entity.rb b/app/serializers/merge_request_widget_entity.rb index 4a812e39ee1..d0165c148eb 100644 --- a/app/serializers/merge_request_widget_entity.rb +++ b/app/serializers/merge_request_widget_entity.rb @@ -2,6 +2,7 @@ class MergeRequestWidgetEntity < IssuableEntity expose :state expose :in_progress_merge_commit_sha expose :merge_commit_sha + expose :short_merge_commit_sha expose :merge_error expose :merge_params expose :merge_status @@ -207,6 +208,12 @@ class MergeRequestWidgetEntity < IssuableEntity commit_change_content_project_merge_request_path(merge_request.project, merge_request) end + expose :merge_commit_path do |merge_request| + if merge_request.merge_commit_sha + project_commit_path(merge_request.project, merge_request.merge_commit_sha) + end + end + private delegate :current_user, to: :request -- cgit v1.2.1