diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-07-25 06:21:55 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-07-26 16:53:39 -0700 |
| commit | 871723da7fa6b341b64197e27c6bd99d52f2dcd8 (patch) | |
| tree | ca49827a4c589d8402a380276d4ae6ca5bc916ce /app/models/ability.rb | |
| parent | d1ea2bca61dff21948024d897e1d4475123a10e8 (diff) | |
| download | gitlab-ce-871723da7fa6b341b64197e27c6bd99d52f2dcd8.tar.gz | |
Incorporate review comments
Diffstat (limited to 'app/models/ability.rb')
| -rw-r--r-- | app/models/ability.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb index 6884d99c5a6..e47c5539f60 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -389,10 +389,8 @@ class Ability end def can_edit_note?(user, note) - return false unless note.editable? - return false unless user.present? - return true if note.author == user - return true if user.admin? + return false if !note.editable? || !user.present? + return true if note.author == user || user.admin? if note.project max_access_level = note.project.team.max_member_access(user.id) |