Skip to content
Snippets Groups Projects
Commit 774b7ee2 authored by Stan Hu's avatar Stan Hu
Browse files

Fix Error 500 when relative submodule resolves to a namespace that has a...

Fix Error 500 when relative submodule resolves to a namespace that has a different name from its path

Closes #1849
parent 88343897
No related branches found
No related tags found
1 merge request!864Fix Error 500 when relative submodule resolves to a namespace that has a different name from its path
Please view this file on the master branch, on stable branches it's out of date.
 
v 7.13.0 (unreleased)
- Fix Error 500 when relative submodule resolves to a namespace that has a different name from its path (Stan Hu)
- Update maintenance documentation to explain no need to recompile asssets for omnibus installations (Stan Hu)
- Support commenting on diffs in side-by-side mode (Stan Hu)
- Fix JavaScript error when clicking on the comment button on a diff line that has a comment already (Stan Hu)
Loading
Loading
Loading
Loading
@@ -63,7 +63,7 @@ module SubmoduleHelper
namespace = components.pop.gsub(/^\.\.$/, '')
 
if namespace.empty?
namespace = @project.namespace.name
namespace = @project.namespace.path
end
 
[
Loading
Loading
Loading
Loading
@@ -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] }
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment