diff options
author | Stan Hu <stanhu@gmail.com> | 2016-07-16 05:18:19 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2016-07-16 05:18:19 +0000 |
commit | 2550c1c2bc70beb14293eebb243a2f6f3039d04b (patch) | |
tree | d15993c85596b7d159243022478d28de1bdb6ce0 /lib | |
parent | 9b597fb5c1bb322416aadf9c1a41f26d7c08e10f (diff) | |
parent | e94d3834c7d32f6e8a1d3d4c32d8be8cb1d7810c (diff) | |
download | gitlab-ce-2550c1c2bc70beb14293eebb243a2f6f3039d04b.tar.gz |
Merge branch '19842-cloning-a-gitlab-wiki-returns-the-repo-not-the-repo-s-wiki' into 'master'
Fix a bug where the project's repository path was returned instead of the wiki path
Closes #19842
See merge request !5292
Diffstat (limited to 'lib')
-rw-r--r-- | lib/api/internal.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/api/internal.rb b/lib/api/internal.rb index d5dfba5e0cc..959b700de78 100644 --- a/lib/api/internal.rb +++ b/lib/api/internal.rb @@ -63,7 +63,12 @@ module API if access_status.status # Return the repository full path so that gitlab-shell has it when # handling ssh commands - response[:repository_path] = project.repository.path_to_repo + response[:repository_path] = + if wiki? + project.wiki.repository.path_to_repo + else + project.repository.path_to_repo + end end response |