summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-26 15:55:56 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-26 15:55:56 +0200
commit342d5537091e61c1fc52f3e54df926159f326eb8 (patch)
tree6e852b3f112a6a9f03d05148ed5e73e13582a48e /app/models
parentd5947ada4493335d49368ec193f4b9b801582deb (diff)
downloadgitlab-ce-rename-abilities.tar.gz
Rename abilities to correspond contoller/model action namesrename-abilities
write_ was renamed to create_ modify_ was renamed to update_ So now in update action we have next code def create can?(current_user, :create_issue, @issue) end def update can?(current_user, :update_issue, @issue) end Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/models')
-rw-r--r--app/models/ability.rb26
1 files changed, 13 insertions, 13 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb
index c90c99c5b5f..6e727ca7b56 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -144,9 +144,9 @@ class Ability
:read_project_member,
:read_merge_request,
:read_note,
- :write_project,
- :write_issue,
- :write_note
+ :create_project,
+ :create_issue,
+ :create_note
]
end
@@ -154,15 +154,15 @@ class Ability
project_guest_rules + [
:download_code,
:fork_project,
- :write_project_snippet
+ :create_project_snippet
]
end
def project_dev_rules
project_report_rules + [
- :write_merge_request,
- :write_wiki,
- :modify_issue,
+ :create_merge_request,
+ :create_wiki,
+ :update_issue,
:admin_issue,
:admin_label,
:push_code
@@ -171,10 +171,10 @@ class Ability
def project_archived_rules
[
- :write_merge_request,
+ :create_merge_request,
:push_code,
:push_code_to_protected_branches,
- :modify_merge_request,
+ :update_merge_request,
:admin_merge_request
]
end
@@ -182,9 +182,9 @@ class Ability
def project_master_rules
project_dev_rules + [
:push_code_to_protected_branches,
- :modify_issue,
- :modify_project_snippet,
- :modify_merge_request,
+ :update_issue,
+ :update_project_snippet,
+ :update_merge_request,
:admin_milestone,
:admin_project_snippet,
:admin_project_member,
@@ -277,7 +277,7 @@ class Ability
group = subject.group
can_manage = group_abilities(user, group).include?(:admin_group)
if can_manage && (user != target_user)
- rules << :modify_group_member
+ rules << :update_group_member
rules << :destroy_group_member
end
if !group.last_owner?(user) && (can_manage || (user == target_user))