BigW Consortium Gitlab

  1. 20 Jun, 2016 18 commits
  2. 18 Jun, 2016 18 commits
  3. 17 Jun, 2016 4 commits
    • Merge branch 'issue_12758' into 'master' · 00906b5b
      Douwe Maan authored
      Implement custom notification level options
      
      ![Screen_Shot_2016-06-17_at_15.31.43](/uploads/3fc47d2f461b3e8b67bb8acaa304cf99/Screen_Shot_2016-06-17_at_15.31.43.png)
      
      ![Screenshot_from_2016-06-15_10-52-27](/uploads/88dbdd21d97e80ee772fe08fa0c9b393/Screenshot_from_2016-06-15_10-52-27.png)
      
      part of #12758 
      
      See merge request !4389
    • Merge branch 'fix-18717' into 'master' · 33d8972b
      Douwe Maan authored
      Ensure that group owner cannot request access to a project of their group
      
      ## What does this MR do?
      
      It fixes two things:
      
      - 91ad995d69e1a0f8991fd896f1d9febc109273fe Ensure that group owner cannot request access to a project of their group
      - ec3ff061148d556757e7cd486cdc6083d77acf34 Ensure group/project owners can see their members' access_level (see the commit message for details)
      
      ## Are there points in the code the reviewer needs to double check?
      
      Not really, these are pretty simple fixes.
      
      ## Why was this MR needed?
      
      Because there was an issue created!
      
      ## What are the relevant issue numbers?
      
      Fixes #18717.
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] CHANGELOG is not needed since the bug is only present in a 8.9 RC
      - [x] Tests
        - [x] 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 !4729
    • Merge branch 'issuable-todo-improvements' · b218e82b
      Douwe Maan authored
      # Conflicts:
      #	app/controllers/projects/todos_controller.rb