diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-07-19 21:27:38 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-07-19 21:27:38 +0000 |
| commit | d0ef64ac8eedae3544e700d94a2373184c9597ee (patch) | |
| tree | 170efccfbcb83d3e095af61ccab36c6e590a3545 | |
| parent | e8aaf5680355b2a71ab85439f653a70f4b487e0b (diff) | |
| parent | e65b08106282015955fce52e818b7431d5cb2e83 (diff) | |
| download | gitlab-ce-d0ef64ac8eedae3544e700d94a2373184c9597ee.tar.gz | |
Merge branch 'rs-issue-2001' into 'master'
Dynamically check `:admin_*` ability in issuable context
Closes #2001
See merge request !1002
| -rw-r--r-- | app/views/shared/issuable/_context.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/shared/issuable/_context.html.haml b/app/views/shared/issuable/_context.html.haml index 46990895d33..d1bd5ef968d 100644 --- a/app/views/shared/issuable/_context.html.haml +++ b/app/views/shared/issuable/_context.html.haml @@ -8,7 +8,7 @@ - else none .issuable-context-selectbox - - if can?(current_user, :admin_issue, @project) + - if can?(current_user, :"admin_#{issuable.class.to_s.underscore}", @project) = users_select_tag("#{issuable.class.table_name.singularize}[assignee_id]", placeholder: 'Select assignee', class: 'custom-form-control js-select2 js-assignee', selected: issuable.assignee_id, project: @target_project, null_user: true) %div.prepend-top-20.clearfix @@ -24,7 +24,7 @@ - else none .issuable-context-selectbox - - if can?(current_user, :admin_issue, @project) + - if can?(current_user, :"admin_#{issuable.class.to_s.underscore}", @project) = f.select(:milestone_id, milestone_options(issuable), { include_blank: 'Select milestone' }, {class: 'select2 select2-compact js-select2 js-milestone'}) = hidden_field_tag :issuable_context = f.submit class: 'btn hide' |