diff options
author | Izaak Alpert <ialpert@blackberry.com> | 2013-07-12 12:23:42 -0400 |
---|---|---|
committer | Izaak Alpert <ialpert@blackberry.com> | 2013-07-17 22:46:38 -0400 |
commit | 0ef055a4aef76d20668a40717fb33bfe41599cfb (patch) | |
tree | caa845c06e1b0c61dce3038474383696ad2ea691 /app/models/note.rb | |
parent | 09112dbb1df2669b0042d6d785a5469a9855ac20 (diff) | |
download | gitlab-ce-0ef055a4aef76d20668a40717fb33bfe41599cfb.tar.gz |
MR on fork: Email fixes, style fixes
-Removed many extra spaces I added
-Fixed email templates to be consistent/better looking
GITLAB-894, GITLAB-895, (GITLAB-858)
Change-Id: I35c1a8e0e22af7de26d54e5c3da987fa7bb3921e
Diffstat (limited to 'app/models/note.rb')
-rw-r--r-- | app/models/note.rb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index 0175430be4d..6b119f00235 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -52,11 +52,11 @@ class Note < ActiveRecord::Base def self.create_status_change_note(noteable, project, author, status) create({ - noteable: noteable, - project: project, - author: author, - note: "_Status changed to #{status}_" - }, without_protection: true) + noteable: noteable, + project: project, + author: author, + note: "_Status changed to #{status}_" + }, without_protection: true) end def commit_author @@ -97,7 +97,7 @@ class Note < ActiveRecord::Base # otherwise false is returned def downvote? votable? && (note.start_with?('-1') || - note.start_with?(':-1:') + note.start_with?(':-1:') ) end @@ -136,8 +136,8 @@ class Note < ActiveRecord::Base else super end - # Temp fix to prevent app crash - # if note commit id doesn't exist + # Temp fix to prevent app crash + # if note commit id doesn't exist rescue nil end @@ -146,7 +146,7 @@ class Note < ActiveRecord::Base # otherwise false is returned def upvote? votable? && (note.start_with?('+1') || - note.start_with?(':+1:') + note.start_with?(':+1:') ) end |