diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-29 11:57:06 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-29 11:57:06 +0000 |
commit | 88c60307bd1f215095834f09a1a5cb18701ac8ad (patch) | |
tree | 2d9343109bcdf6bcc3ba19ef6b9f7186e361465c /app/workers | |
parent | 971604de4cfa324d91c41650fabc129420c8d1cc (diff) | |
parent | 70b05a83772abc59b3c914c84bc4d2c07749884d (diff) | |
download | gitlab-ce-88c60307bd1f215095834f09a1a5cb18701ac8ad.tar.gz |
Merge branch 'dm-merge-request-creations-controller' into 'master'
Split up MergeRequestsController
See merge request !12150
Diffstat (limited to 'app/workers')
-rw-r--r-- | app/workers/expire_pipeline_cache_worker.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/workers/expire_pipeline_cache_worker.rb b/app/workers/expire_pipeline_cache_worker.rb index d760f5b140f..92e622285de 100644 --- a/app/workers/expire_pipeline_cache_worker.rb +++ b/app/workers/expire_pipeline_cache_worker.rb @@ -46,7 +46,7 @@ class ExpirePipelineCacheWorker end def new_merge_request_pipelines_path(project) - Gitlab::Routing.url_helpers.new_namespace_project_merge_request_path( + Gitlab::Routing.url_helpers.namespace_project_new_merge_request_path( project.namespace, project, format: :json) |