diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-12-24 14:00:29 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-12-24 14:00:29 -0500 |
| commit | 1042c16b4b039c3bb946c1534cd7556472dfabd6 (patch) | |
| tree | 88d6fdfff732b3bd5183ef624e3da79eab6ec371 | |
| parent | a9b82220e8e31a6e214d16e6baa49eafd35d1c5c (diff) | |
| parent | 7caaa10807ce61bc1489c91c9150c92ca7997132 (diff) | |
| download | gitlab-ce-1042c16b4b039c3bb946c1534cd7556472dfabd6.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
| -rw-r--r-- | app/models/ability.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb index cd5ae0fb0fd..1b3ee757040 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -132,14 +132,14 @@ class Ability end def public_project_rules - project_guest_rules + [ + @public_project_rules ||= project_guest_rules + [ :download_code, :fork_project ] end def project_guest_rules - [ + @project_guest_rules ||= [ :read_project, :read_wiki, :read_issue, @@ -157,7 +157,7 @@ class Ability end def project_report_rules - project_guest_rules + [ + @project_report_rules ||= project_guest_rules + [ :create_commit_status, :read_commit_statuses, :download_code, @@ -170,7 +170,7 @@ class Ability end def project_dev_rules - project_report_rules + [ + @project_dev_rules ||= project_report_rules + [ :admin_merge_request, :create_merge_request, :create_wiki, @@ -181,7 +181,7 @@ class Ability end def project_archived_rules - [ + @project_archived_rules ||= [ :create_merge_request, :push_code, :push_code_to_protected_branches, @@ -191,7 +191,7 @@ class Ability end def project_master_rules - project_dev_rules + [ + @project_master_rules ||= project_dev_rules + [ :push_code_to_protected_branches, :update_project_snippet, :update_merge_request, @@ -206,7 +206,7 @@ class Ability end def project_admin_rules - project_master_rules + [ + @project_admin_rules ||= project_master_rules + [ :change_namespace, :change_visibility_level, :rename_project, @@ -332,7 +332,7 @@ class Ability end if snippet.public? || snippet.internal? - rules << :read_personal_snippet + rules << :read_personal_snippet end rules |