summaryrefslogtreecommitdiff
path: root/lib/tasks
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-07-25 15:08:20 +0000
committerRémy Coutable <remy@rymai.me>2016-07-25 15:08:20 +0000
commitc4ba2b15033d044cddb7d929325c543378cc760f (patch)
treefa96452f43a4b4485d61e5f2e01e3a7e3ae8a19c /lib/tasks
parent720d3be2c4fd4186d320694e869ccf25498edb34 (diff)
parentc6ff77d4b892c41c9fdbd8a8fbaec9ed611e10a4 (diff)
downloadgitlab-ce-c4ba2b15033d044cddb7d929325c543378cc760f.tar.gz
Merge branch 'fix-backup-restore' into 'master'
Fix backup restore ## What does this MR do? This MR fixes the backup restore task. ## Are there points in the code the reviewer needs to double check? Whether the mode 0277 makes sense. (Group SUID + group/user read/write permissions) ## Why was this MR needed? 86359ec8 broke this, and it was not caught by any specs. Users would see: ``` Restoring repositories ... rake aborted! NameError: undefined local variable or method `repos_path' for #<Backup::Repository:0x00000007cea1d8> /opt/gitlab/embedded/service/gitlab-rails/lib/backup/repository.rb:59:in `restore' /opt/gitlab/embedded/service/gitlab-rails/lib/tasks/gitlab/backup.rake:79:in `block (4 levels) in <top (required)>' /opt/gitlab/embedded/service/gitlab-rails/lib/tasks/gitlab/backup.rake:54:in `block (3 levels) in <top (required)>' Tasks: TOP => gitlab:backup:repo:restore (See full trace by running task with --trace) ``` ## What are the relevant issue numbers? #20188 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [ ] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5459
Diffstat (limited to 'lib/tasks')
0 files changed, 0 insertions, 0 deletions