summaryrefslogtreecommitdiff
path: root/app/serializers
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2018-07-02 17:09:49 +0200
committerYorick Peterse <yorickpeterse@gmail.com>2018-07-25 16:41:29 +0200
commit7a233b37cd1281698107f1f3236b425bf4cc5ae7 (patch)
tree5e73c37e2294488c31e148b40bb5f49cd0a507a8 /app/serializers
parent995588ad627e9c97c1ebb1124a8c24d2fd117313 (diff)
downloadgitlab-ce-7a233b37cd1281698107f1f3236b425bf4cc5ae7.tar.gz
Remove code for dynamically generating routesstop-dynamic-routable-creation
This adds a database migration that creates routes for any projects and namespaces that don't already have one. We also remove the runtime code for dynamically creating routes, as this is no longer necessary.
Diffstat (limited to 'app/serializers')
-rw-r--r--app/serializers/pipeline_serializer.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/app/serializers/pipeline_serializer.rb b/app/serializers/pipeline_serializer.rb
index 4a33160afa1..3205578b83e 100644
--- a/app/serializers/pipeline_serializer.rb
+++ b/app/serializers/pipeline_serializer.rb
@@ -11,10 +11,15 @@ class PipelineSerializer < BaseSerializer
:retryable_builds,
:cancelable_statuses,
:trigger_requests,
- :project,
:manual_actions,
:artifacts,
- { pending_builds: :project }
+ {
+ pending_builds: :project,
+ project: [:route, { namespace: :route }],
+ artifacts: {
+ project: [:route, { namespace: :route }]
+ }
+ }
])
end