From 061bc72f46392176996f101627aea3515b9d5cfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Geuken?= Date: Thu, 14 Dec 2017 13:00:00 +0100 Subject: [PATCH] [frontend] Fix Style/AndOr offense Mob-programming with @DavidKang --- .rubocop_todo.yml | 8 -------- src/api/app/views/message/_messages.xml.builder | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 460fb0428dc..d5ecae6068f 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -329,14 +329,6 @@ Rails/SkipsModelValidations: Rails/TimeZone: Enabled: false -# Offense count: 1 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: always, conditionals -Style/AndOr: - Exclude: - - 'src/api/app/views/message/_messages.xml.builder' - # Offense count: 130 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods. diff --git a/src/api/app/views/message/_messages.xml.builder b/src/api/app/views/message/_messages.xml.builder index 6031250bb7f..fb3371f5dff 100644 --- a/src/api/app/views/message/_messages.xml.builder +++ b/src/api/app/views/message/_messages.xml.builder @@ -8,7 +8,7 @@ root_attrs[:package] = @package.name if @package xml.messages(root_attrs) do @messages.each do |msg| attrs = {} - attrs[:severity] = msg.severity or attrs[:severity] = 0 + attrs[:severity] = msg.severity || 0 attrs[:sent_at] = msg.sent_at.xmlschema if msg.sent_at attrs[:user] = msg.user.login if msg.user msg.send_mail ? attrs[:send_mail] = true : attrs[:send_mail] = false