diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-08-01 01:01:36 +0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-08-07 21:23:37 +0300 |
| commit | 0640b3d1d89b7a4eda343eb23b0518a835ac9106 (patch) | |
| tree | 13970b43017ada593f08b70ca713dc19a1f064cf /app/serializers | |
| parent | b12107a0b953b566cd58db30ae880800a4a695a6 (diff) | |
Store MergeWorker JID on merge request, and clean up stuck merges
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/merge_request_entity.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/merge_request_entity.rb b/app/serializers/merge_request_entity.rb index 7f17f2bf604..07650ce6f20 100644 --- a/app/serializers/merge_request_entity.rb +++ b/app/serializers/merge_request_entity.rb @@ -2,7 +2,6 @@ class MergeRequestEntity < IssuableEntity include RequestAwareEntity expose :in_progress_merge_commit_sha - expose :locked_at expose :merge_commit_sha expose :merge_error expose :merge_params @@ -32,6 +31,7 @@ class MergeRequestEntity < IssuableEntity expose :head_pipeline, with: PipelineDetailsEntity, as: :pipeline # Booleans + expose :merge_ongoing?, as: :merge_ongoing expose :work_in_progress?, as: :work_in_progress expose :source_branch_exists?, as: :source_branch_exists expose :mergeable_discussions_state?, as: :mergeable_discussions_state |