diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-29 17:04:04 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-29 17:04:04 +0300 |
| commit | 88162f697087594e714283f43301a0c35d8b44ee (patch) | |
| tree | 535fd71b77eddae4202148d42798d73fc2e2eeef /app | |
| parent | 8e6efc5e751011225faf676f8ae9a458070e4dd7 (diff) | |
| parent | 774b7ee277bbad5bbd16a23664cbc2ba7f3b6499 (diff) | |
Merge branch 'fix-relative-submodule-namespace-path' into 'master'
Fix Error 500 when relative submodule resolves to a namespace that has a different name from its path
### What does this MR do?
This MR fixes a bug in resolving a namespace when the `name` differed from `path`.
### Why was this MR needed?
The original code was using `name`, when the proper input to `namespace_project_path` was `path`.
### What are the relevant issue numbers?
Closes #1849
See merge request !864
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/submodule_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/submodule_helper.rb b/app/helpers/submodule_helper.rb index 6def7793dc3..b3f50ceebe4 100644 --- a/app/helpers/submodule_helper.rb +++ b/app/helpers/submodule_helper.rb @@ -63,7 +63,7 @@ module SubmoduleHelper namespace = components.pop.gsub(/^\.\.$/, '') if namespace.empty? - namespace = @project.namespace.name + namespace = @project.namespace.path end [ |