diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-30 12:31:41 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-06-30 12:37:35 +0100 |
| commit | 531a4d124b0a17280b4118d7fa7c66f11042917b (patch) | |
| tree | a2ee668d403ed538d6046f942f31bce2c1224563 /spec/controllers/projects/blob_controller_spec.rb | |
| parent | f5681fb55a762c9b9bb35c80bf87d727d8d8fd06 (diff) | |
| parent | 81dba76b9d7d120cd22e3619a4058bd4885be9bc (diff) | |
| download | gitlab-ce-experimental-breadcrumbs.tar.gz | |
Merge branch 'master' into experimental-breadcrumbsexperimental-breadcrumbs
Diffstat (limited to 'spec/controllers/projects/blob_controller_spec.rb')
| -rw-r--r-- | spec/controllers/projects/blob_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/projects/blob_controller_spec.rb b/spec/controllers/projects/blob_controller_spec.rb index c20cf6a4291..561bc219bb4 100644 --- a/spec/controllers/projects/blob_controller_spec.rb +++ b/spec/controllers/projects/blob_controller_spec.rb @@ -235,7 +235,7 @@ describe Projects::BlobController do put :update, default_params expect(response).to redirect_to( - new_namespace_project_merge_request_path( + namespace_project_new_merge_request_path( forked_project.namespace, forked_project, merge_request: { |