diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2014-11-12 13:14:13 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2014-11-12 13:14:13 +0200 |
| commit | 1a7e3476351979d37cd5fa2b7b5800717487d758 (patch) | |
| tree | 944564aabc35977b9771933ced239d46ddece10b /lib/backup | |
| parent | 8146271d4043a91e8f65c7af41c6c015e7d155c3 (diff) | |
| parent | c58edd7c708c39a6e7c60bd96c7f97ced370f304 (diff) | |
| download | gitlab-ce-1a7e3476351979d37cd5fa2b7b5800717487d758.tar.gz | |
Merge remote-tracking branch 'origin/master' into backup_restore_drop_sequences
Conflicts:
CHANGELOG
Diffstat (limited to 'lib/backup')
| -rw-r--r-- | lib/backup/repository.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb index 380beac708d..0bb02f1a357 100644 --- a/lib/backup/repository.rb +++ b/lib/backup/repository.rb @@ -91,7 +91,7 @@ module Backup protected def path_to_repo(project) - File.join(repos_path, project.path_with_namespace + '.git') + project.repository.path_to_repo end def path_to_bundle(project) |