diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-24 21:29:22 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-24 21:29:22 +0200 |
| commit | 4645f464a310d9b13620fdbc0e9a0933f427aca7 (patch) | |
| tree | 9ffa8d2aee80cc9f0c3ef67224b2867d2d414d9f | |
| parent | baccb9a4079311835f496f14a5dc411ac779bb23 (diff) | |
| download | gitlab-ce-4645f464a310d9b13620fdbc0e9a0933f427aca7.tar.gz | |
Allow developers to mange issue tracker
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | app/controllers/projects/issues_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/ability.rb | 1 | ||||
| -rw-r--r-- | app/views/help/permissions.html.haml | 7 |
4 files changed, 12 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 2e5cd78c8a8..06008e78d6b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +v 6.6.0 + - Permissions: Developer now can manage issue tracker (modify any issue) + v 6.5.1 - Fix branch selectbox when create merge request from fork diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 2ec270b3159..f260a2e0597 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -9,7 +9,7 @@ class Projects::IssuesController < Projects::ApplicationController before_filter :authorize_write_issue!, only: [:new, :create] # Allow modify issue - before_filter :authorize_modify_issue!, only: [:edit, :update] + before_filter :authorize_modify_issue!, only: [:edit, :update, :bulk_update] respond_to :html diff --git a/app/models/ability.rb b/app/models/ability.rb index cf925141f2d..038668fccff 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -125,6 +125,7 @@ class Ability project_report_rules + [ :write_merge_request, :write_wiki, + :modify_issue, :push_code ] end diff --git a/app/views/help/permissions.html.haml b/app/views/help/permissions.html.haml index 15e3bf3a135..6505609022a 100644 --- a/app/views/help/permissions.html.haml +++ b/app/views/help/permissions.html.haml @@ -101,6 +101,13 @@ %td.permission-x ✓ %td.permission-x ✓ %tr + %td Manage issue tracker + %td + %td + %td.permission-x ✓ + %td.permission-x ✓ + %td.permission-x ✓ + %tr %td Add new team members %td %td |