diff options
author | Nick Thomas <nick@gitlab.com> | 2017-10-20 10:27:48 +0000 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2017-10-20 10:27:48 +0000 |
commit | bc734d34479dfe80984b851153447ce03d4c93a0 (patch) | |
tree | da18a7a238ba3b8ffdb2672d9a5f446472556429 /app | |
parent | b4dc0ba2c57c150f847d255b0d2d831ff60728ad (diff) | |
parent | 314e5b5f20889971fef092c26bcb675ac2af4b07 (diff) | |
download | gitlab-ce-bc734d34479dfe80984b851153447ce03d4c93a0.tar.gz |
Merge branch '37391-wiki-disk-path-helper' into 'master'
Use wiki.disk_path
See merge request gitlab-org/gitlab-ce!14930
Diffstat (limited to 'app')
-rw-r--r-- | app/services/projects/destroy_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb index 19d75ff2efa..81972df9b3c 100644 --- a/app/services/projects/destroy_service.rb +++ b/app/services/projects/destroy_service.rb @@ -51,7 +51,7 @@ module Projects end def wiki_path - repo_path + '.wiki' + project.wiki.disk_path end def trash_repositories! |