diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-11-30 12:11:11 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-11-30 12:11:11 +0000 |
| commit | 28a95f1292a379b9aad4f1c7b00bb5f2af1660a1 (patch) | |
| tree | 3cc77ff79f378b0af7c28703519da87e1ee74f07 /CHANGELOG | |
| parent | b08a80fd26f55018a52c8cb17ac7d9fee4fa9b9c (diff) | |
| parent | 880478b21e7c9b0068b3e14b8f7fb58ada2c232e (diff) | |
| download | gitlab-ce-28a95f1292a379b9aad4f1c7b00bb5f2af1660a1.tar.gz | |
Merge branch 'restore_wikis' into 'master'
Fix wiki restore
Seems 4a5044e302 only fixed git repos restore. This MR provides the same functionality that was introduced in the aforementioned commit, but for wikis.
See merge request !247
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index fd902050913..18c559ecc17 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,7 +2,7 @@ v 7.6.0 - Fork repository to groups - New rugged version - Add CRON=1 backup setting for quiet backups - - + - Fix failing wiki restore - - Add optional Sidekiq MemoryKiller middleware (enabled via SIDEKIQ_MAX_RSS env variable) - |