• Rémy Coutable's avatar
    Merge branch 'fix-backup-restore' into 'master' · c4ba2b15
    Rémy Coutable authored
    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
    c4ba2b15
To find the state of this project's repository at the time of any of these versions, check out the tags.
CHANGELOG 173 KB