summaryrefslogtreecommitdiff
path: root/lib/api/notes.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-10 11:51:24 +0000
committerDouwe Maan <douwe@gitlab.com>2015-04-10 11:51:24 +0000
commit6331759735074e2b14d398dfa1804cfa1f241d49 (patch)
treea7155181e56614daa890fa245f76e00a4df753ac /lib/api/notes.rb
parent149195eded675717e6c5c1e3a8b1dae2d4082ae0 (diff)
parent7d089701f1a9c15117e3e2d6f21eabaf08659ff6 (diff)
downloadgitlab-ce-6331759735074e2b14d398dfa1804cfa1f241d49.tar.gz
Merge branch 'fix-submodules-with-relative-links' into 'master'
Fix broken file browsing with a submodule that has a relative link ## What does this MR do? This MR fixes an error that occurs when browsing a submodule with a relative link. ### Are there points in the code the reviewer needs to double check? I re-wrote the function because I was confused by how the first one was supposed to work. Please review if it's clearer. ### Why was this MR needed? A 500 Error would occur when using the file browser on a repo with a submodule. Here's how to reproduce the bug: 1. Start a new project in GitLab. 2. Clone git://git.gniibe.org/gnuk/gnuk.git/ locally. 3. Push repo to new project. 4. Click on "Files" in the project. The .gitmodules file: ``` [submodule "chopstx"] path = chopstx url = ../../chopstx/chopstx.git ``` ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? 1. #775 2. #1385 3. https://github.com/gitlabhq/gitlabhq/issues/8153 4. https://github.com/gitlabhq/gitlabhq/issues/8881 5. https://github.com/gitlabhq/gitlabhq/issues/7554 See merge request !508
Diffstat (limited to 'lib/api/notes.rb')
0 files changed, 0 insertions, 0 deletions