summaryrefslogtreecommitdiff
path: root/lib/api/internal.rb
diff options
context:
space:
mode:
authortiagonbotelho <tiagonbotelho@hotmail.com>2016-07-18 14:59:12 +0100
committertiagonbotelho <tiagonbotelho@hotmail.com>2016-07-18 14:59:12 +0100
commit50f3d0d4f1392b3e45abe623506965016889cf8b (patch)
tree5e0dff94916042d4a3a33ffb4f42f21bd0d10535 /lib/api/internal.rb
parentc6097f24d32610d4c12ae0e9d16b72dc53cda9da (diff)
parent017ae313dc84682e260e960f93fb4a55af0df523 (diff)
downloadgitlab-ce-50f3d0d4f1392b3e45abe623506965016889cf8b.tar.gz
Merge branch 'master' into rename-repo-files
Diffstat (limited to 'lib/api/internal.rb')
-rw-r--r--lib/api/internal.rb7
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