diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-11-30 18:03:31 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-11-30 18:03:31 +0000 |
| commit | 3dc986cff191a3db60d07b9a841275062b5eb3fa (patch) | |
| tree | 3ac9a12b5fb1f386e193332de8200651ba32387c /lib/api/internal.rb | |
| parent | 05f40bbfc8548826ddcb8401fba727c7fc414cca (diff) | |
| parent | 191aa9712eeb8fe39e8947dc681cefe4221044ec (diff) | |
| download | gitlab-ce-3dc986cff191a3db60d07b9a841275062b5eb3fa.tar.gz | |
Merge branch 'backup_restore' into 'master'
Properly fix wiki restore
My previous patch didn't fix the restore issue (!247).
ProjectWiki.new() creates a new wiki git repository, so any tries to bare clone a bundle fail. With this patch we remove the newly created wiki.git before restoring from the backup bundle.
\cc @jacobvosmaer @dzaporozhets are you ok with this solution/hack?
Relevant issues: #845
See merge request !248
Diffstat (limited to 'lib/api/internal.rb')
0 files changed, 0 insertions, 0 deletions