diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
| commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
| tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /app/serializers/merge_request_poll_cached_widget_entity.rb | |
| parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) | |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'app/serializers/merge_request_poll_cached_widget_entity.rb')
| -rw-r--r-- | app/serializers/merge_request_poll_cached_widget_entity.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/serializers/merge_request_poll_cached_widget_entity.rb b/app/serializers/merge_request_poll_cached_widget_entity.rb index c51c08ab646..002be8be729 100644 --- a/app/serializers/merge_request_poll_cached_widget_entity.rb +++ b/app/serializers/merge_request_poll_cached_widget_entity.rb @@ -3,8 +3,8 @@ class MergeRequestPollCachedWidgetEntity < IssuableEntity expose :auto_merge_enabled expose :state - expose :merge_commit_sha - expose :short_merge_commit_sha + expose :merged_commit_sha + expose :short_merged_commit_sha expose :merge_error expose :public_merge_status, as: :merge_status expose :merge_user_id @@ -56,9 +56,9 @@ class MergeRequestPollCachedWidgetEntity < IssuableEntity presenter(merge_request).target_branch_tree_path 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) + expose :merged_commit_path do |merge_request| + if sha = merge_request.merged_commit_sha + project_commit_path(merge_request.project, sha) end end |