diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2019-03-13 15:32:12 +0700 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-03-13 15:32:12 +0700 |
| commit | f00e368bc05f08760eb1d62ae1cbba7999b5fc28 (patch) | |
| tree | 25a426bc704274e963387946c1b6479753ded751 | |
| parent | 1dbd61d5c1cfe0834ea180a9b87886d63f582ba9 (diff) | |
| download | gitlab-ce-fix-ref-in-pipeline-entity.tar.gz | |
| -rw-r--r-- | app/models/ci/pipeline.rb | 4 | ||||
| -rw-r--r-- | app/serializers/pipeline_entity.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 1e245a3963c..3464754c4a2 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -742,6 +742,10 @@ module Ci triggered_by_merge_request? && target_sha == merge_request.target_branch_sha end + def branch_ref? + !tag && !merge_request_ref? + end + def merge_request_ref? MergeRequest.merge_request_ref?(ref) end diff --git a/app/serializers/pipeline_entity.rb b/app/serializers/pipeline_entity.rb index 42624176140..9873624ebe4 100644 --- a/app/serializers/pipeline_entity.rb +++ b/app/serializers/pipeline_entity.rb @@ -53,7 +53,7 @@ class PipelineEntity < Grape::Entity end expose :tag?, as: :tag - expose :branch?, as: :branch + expose :branch_ref?, as: :branch expose :merge_request_ref?, as: :merge_request end |