diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-12-05 10:32:39 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-12-05 10:32:39 +0000 |
| commit | fb048d2cf5597a24dccaf02c4db5f6747214742c (patch) | |
| tree | 1aeeeb8518dd92a8ff2dc6b9c748f2bd16c2f0b7 /app/serializers | |
| parent | 07779a463af4b09aea77f027a9cd8dcddaa6eebe (diff) | |
| parent | 08e50c996c2d427618f1714d99f412514393dd92 (diff) | |
| download | gitlab-ce-fb048d2cf5597a24dccaf02c4db5f6747214742c.tar.gz | |
Merge branch 'mr-pipelines-2' into 'master'
Merge request pipelines
See merge request gitlab-org/gitlab-ce!23217
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/pipeline_entity.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/serializers/pipeline_entity.rb b/app/serializers/pipeline_entity.rb index aef838409e0..477b6710168 100644 --- a/app/serializers/pipeline_entity.rb +++ b/app/serializers/pipeline_entity.rb @@ -48,6 +48,7 @@ class PipelineEntity < Grape::Entity expose :tag?, as: :tag expose :branch?, as: :branch + expose :merge_request?, as: :merge_request end expose :commit, using: CommitEntity |