diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-10 19:40:18 +0100 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-10 19:40:18 +0100 |
| commit | b20f677baa94aaea1dbc3437c51abbfd6f0e1548 (patch) | |
| tree | 2baa6a04f1e10deb920b63ea1a28b8f1cc8457a6 /app/models/note.rb | |
| parent | 746320cea769f8de33ba2b7f7d6980a911319edf (diff) | |
| parent | e3ee46a13b91a6cefb0efb1841fb24afed37b674 (diff) | |
| download | gitlab-ce-b20f677baa94aaea1dbc3437c51abbfd6f0e1548.tar.gz | |
Merge remote-tracking branch 'origin/emoji_edit_disallow'
Diffstat (limited to 'app/models/note.rb')
| -rw-r--r-- | app/models/note.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index de9392adbf4..8f0efa8d4b7 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -350,7 +350,7 @@ class Note < ActiveRecord::Base end def editable? - !system? + !system? && !is_award end # Checks if note is an award added as a comment |