summaryrefslogtreecommitdiff
path: root/app/models/ci/pipeline.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-20 18:08:51 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-20 18:08:51 +0000
commitdf2eda3f14dccb703bd7054d4ddde7803cb1fe7e (patch)
tree0200bb0def01cde22da3bc4c9ed0a7b0f91d6b50 /app/models/ci/pipeline.rb
parentb9bac6dbf78a5a7976fba14aaeef96bdeb0da612 (diff)
downloadgitlab-ce-df2eda3f14dccb703bd7054d4ddde7803cb1fe7e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/ci/pipeline.rb')
-rw-r--r--app/models/ci/pipeline.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 3209e077a08..4ae64b6c8f1 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -16,6 +16,10 @@ module Ci
include FromUnion
include UpdatedAtFilterable
+ PROJECT_ROUTE_AND_NAMESPACE_ROUTE = {
+ project: [:project_feature, :route, { namespace: :route }]
+ }.freeze
+
BridgeStatusError = Class.new(StandardError)
sha_attribute :source_sha