diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2019-02-25 14:05:26 +0300 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-03-01 16:52:38 +0300 |
| commit | f62dc67d262792829bdcaef779b3915e9cc93a4f (patch) | |
| tree | f9419e96914addb59dfa4ab653c9c6151b33e4e2 /app/serializers/pipeline_entity.rb | |
| parent | dc5fc28382246fbbe2bb6f61fe8dac136b5f3189 (diff) | |
Add suffix for merge request event
Fix
ok
Add spec
Fix
ok
Fix
Add changelog
Fix
Add memoization
a
fix
Diffstat (limited to 'app/serializers/pipeline_entity.rb')
| -rw-r--r-- | app/serializers/pipeline_entity.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/serializers/pipeline_entity.rb b/app/serializers/pipeline_entity.rb index 29b1a6c244b..c2990cb5159 100644 --- a/app/serializers/pipeline_entity.rb +++ b/app/serializers/pipeline_entity.rb @@ -23,7 +23,7 @@ class PipelineEntity < Grape::Entity expose :latest?, as: :latest expose :stuck?, as: :stuck expose :auto_devops_source?, as: :auto_devops - expose :merge_request?, as: :merge_request + expose :merge_request_event?, as: :merge_request expose :has_yaml_errors?, as: :yaml_errors expose :can_retry?, as: :retryable expose :can_cancel?, as: :cancelable @@ -49,7 +49,7 @@ class PipelineEntity < Grape::Entity expose :tag?, as: :tag expose :branch?, as: :branch - expose :merge_request?, as: :merge_request + expose :merge_request_event?, as: :merge_request end expose :commit, using: CommitEntity |