diff options
| -rw-r--r-- | .rubocop_todo.yml | 5 | ||||
| -rw-r--r-- | app/models/message.rb | 20 |
2 files changed, 11 insertions, 14 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index ba0a284ae..1ceff99b9 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -15,11 +15,6 @@ Layout/AlignHash: Enabled: false # Cop supports --auto-correct. -Layout/BlockEndNewline: - Exclude: - - 'app/models/message.rb' - -# Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, IndentOneStep, IndentationWidth. # SupportedStyles: case, end Layout/CaseIndentation: diff --git a/app/models/message.rb b/app/models/message.rb index 648097983..f48785447 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -33,15 +33,17 @@ class Message < ActiveRecord::Base :description => :content, :group => :parent, :type => Proc.new {|o| o.parent_id.nil? ? 'message' : 'reply'}, - :url => Proc.new {|o| - {:controller => 'messages', :action => 'show', - :board_id => o.board_id}. - merge( - if o.parent_id.nil? - {:id => o.id} - else - {:id => o.parent_id, :r => o.id, :anchor => "message-#{o.id}"} - end)} + :url => + Proc.new {|o| + {:controller => 'messages', :action => 'show', + :board_id => o.board_id}. + merge( + if o.parent_id.nil? + {:id => o.id} + else + {:id => o.parent_id, :r => o.id, :anchor => "message-#{o.id}"} + end) + } acts_as_activity_provider :scope => preload({:board => :project}, :author), :author_key => :author_id |