1. 27 Jul, 2016 3 commits
    • Rémy Coutable's avatar
      Merge branch 'fix-backup-restore' into 'master' · 54b71feb
      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
      Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
      54b71feb
    • Fatih Acet's avatar
      Merge branch '20139-branch-icon' into 'master' · d258a522
      Fatih Acet authored
      Add branch or tag icon to ref in builds page
      
      ## What does this MR do?
      Add branch or tag icon to ref in builds page
      
      ## Why was this MR needed?
      It's currently missing but should be there
      
      ## What are the relevant issue numbers?
      Closes #20139
      
      ## Screenshots (if relevant)
      <img src="/uploads/fb5c9a285a1ce95c0aa8dfa5e32c5d7d/Screen_Shot_2016-07-22_at_9.14.39_AM.png" width="400px">
      
      See merge request !5434
      Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
      d258a522
    • Douwe Maan's avatar
      Merge branch 'filter-branch-by-name' into 'master' · 9c5d8585
      Douwe Maan authored
      Users can filter branches by name on project branches page
      
      This MR aims to solve #18674 by adding the possibility to filter project branches by name
      
      ![Screen_Shot_2016-07-07_at_17.21.25](/uploads/b674765d2b1cb8a121c2101715a4568b/Screen_Shot_2016-07-07_at_17.21.25.png)
      
      See merge request !5144
      Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
      9c5d8585
  2. 26 Jul, 2016 4 commits
  3. 25 Jul, 2016 10 commits
  4. 22 Jul, 2016 11 commits
  5. 21 Jul, 2016 12 commits