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 /app/controllers/concerns/creates_commit.rb | |
| parent | f5681fb55a762c9b9bb35c80bf87d727d8d8fd06 (diff) | |
| parent | 81dba76b9d7d120cd22e3619a4058bd4885be9bc (diff) | |
| download | gitlab-ce-experimental-breadcrumbs.tar.gz | |
Merge branch 'master' into experimental-breadcrumbsexperimental-breadcrumbs
Diffstat (limited to 'app/controllers/concerns/creates_commit.rb')
| -rw-r--r-- | app/controllers/concerns/creates_commit.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index 1a9904bbe57..f87db4d9e84 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -78,7 +78,7 @@ module CreatesCommit end def new_merge_request_path - new_namespace_project_merge_request_path( + namespace_project_new_merge_request_path( @project_to_commit_into.namespace, @project_to_commit_into, merge_request: { |