diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-06-14 09:35:18 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-06-14 09:35:18 +0000 |
commit | 0c0ef7dfb6afb1695b62037fc0fa5aba6ce697d7 (patch) | |
tree | 001a653dc38b6bf6ed52b5d59b53e8525f894a4c /app/views | |
parent | 0068ba8db597a0396ce1eddd51776981dd12d970 (diff) | |
parent | 6789d2ebf37d5f0537bea72ba99d3b7711e70728 (diff) | |
download | gitlab-ce-0c0ef7dfb6afb1695b62037fc0fa5aba6ce697d7.tar.gz |
Merge branch 'confidential-issues-in-private-projects' into 'master'
Allow users to create confidential issues in private projects
Closes #14787
## What does this MR do?
Allow users to create confidential issues in private projects, and exclude access to them to project members with `Guest` role.
## Are there points in the code the reviewer needs to double check?
The query generated by the `User#authorized_projects` method.
## Why was this MR needed?
Community have been requesting this feature.
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/14787
https://gitlab.com/gitlab-org/gitlab-ce/issues/3678
## Screenshots (if relevant)
Not relevant.
## Todo
- [x] Allow users to create confidential issues in private projects
- [x] Project members with `Guest` role should not have access to confidential issues
- [ ] ~~Apply changes in EE + Elasticsearch~~ Will be done in another MR, when this got merged
See merge request !3471
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/shared/issuable/_form.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml index 17e2a7e9290..c30bdb0ae91 100644 --- a/app/views/shared/issuable/_form.html.haml +++ b/app/views/shared/issuable/_form.html.haml @@ -35,13 +35,13 @@ .clearfix .error-alert -- if issuable.is_a?(Issue) && !issuable.project.private? +- if issuable.is_a?(Issue) .form-group .col-sm-offset-2.col-sm-10 .checkbox = f.label :confidential do = f.check_box :confidential - This issue is confidential and should only be visible to team members + This issue is confidential and should only be visible to team members with at least Reporter access. - if can?(current_user, :"admin_#{issuable.to_ability_name}", issuable.project) - has_due_date = issuable.has_attribute?(:due_date) |