diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-08-17 21:02:26 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-08-17 21:02:26 +0300 |
commit | 46dc00631aeae34c1964888625c5ccd04da6b4c1 (patch) | |
tree | 78698b5129eb4d91eeca9d75712759c1e4a1bce7 /app/models/ability.rb | |
parent | c063ee5e35146a30825edcfbf15da88585cecdcb (diff) | |
parent | 35caa356f6f111a358c7057b9c3cf9b029483343 (diff) |
Merge branch 'issue-boards' into 'master'
Issue boards
## What are the relevant issue numbers?
- Issue: #17907
- Issue backend: #20335
- Backend MR: !5548
- Frontend MR: !5554
- Documentation !5713
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [X] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- [X] ~~API support added~~
- 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)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5548
Diffstat (limited to 'app/models/ability.rb')
-rw-r--r-- | app/models/ability.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb index d9113ffd99a..55265c3cfcb 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -90,6 +90,8 @@ class Ability if project && project.public? rules = [ :read_project, + :read_board, + :read_list, :read_wiki, :read_label, :read_milestone, @@ -228,6 +230,8 @@ class Ability :read_project, :read_wiki, :read_issue, + :read_board, + :read_list, :read_label, :read_milestone, :read_project_snippet, @@ -249,6 +253,7 @@ class Ability :update_issue, :admin_issue, :admin_label, + :admin_list, :read_commit_status, :read_build, :read_container_image, |