Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-29 17:04:04 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-29 17:04:04 +0300
commit88162f697087594e714283f43301a0c35d8b44ee (patch)
tree535fd71b77eddae4202148d42798d73fc2e2eeef /spec/helpers
parent8e6efc5e751011225faf676f8ae9a458070e4dd7 (diff)
parent774b7ee277bbad5bbd16a23664cbc2ba7f3b6499 (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 'spec/helpers')
-rw-r--r--spec/helpers/submodule_helper_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/helpers/submodule_helper_spec.rb b/spec/helpers/submodule_helper_spec.rb
index a7abf9d3839..10121759132 100644
--- a/spec/helpers/submodule_helper_spec.rb
+++ b/spec/helpers/submodule_helper_spec.rb
@@ -115,7 +115,7 @@ describe SubmoduleHelper do
end
context 'submodules with relative links' do
- let(:group) { create(:group) }
+ let(:group) { create(:group, name: "Master Project", path: "master-project") }
let(:project) { create(:project, group: group) }
let(:commit_id) { sample_commit[:id] }