Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234496
Change subject: Fixed Style/CaseIndentation RuboCop offense
......................................................................
Fixed Style/CaseIndentation RuboCop offense
Bug: T106220
Change-Id: I1d306e6d7e6affaacc45c911856f825fc1556575
---
M .rubocop_todo.yml
M puppet/modules/service/lib/puppet/parser/functions/merge_config.rb
2 files changed, 5 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/96/234496/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 58da8c5..74e2cdb 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -22,12 +22,6 @@
Style/CaseEquality:
Enabled: false
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: IndentWhenRelativeTo, SupportedStyles,
IndentOneStep.
-Style/CaseIndentation:
- Enabled: false
-
# Offense count: 4
# Cop supports --auto-correct.
# Configuration parameters: Keywords.
diff --git a/puppet/modules/service/lib/puppet/parser/functions/merge_config.rb
b/puppet/modules/service/lib/puppet/parser/functions/merge_config.rb
index 3eb888e..faefcf3 100644
--- a/puppet/modules/service/lib/puppet/parser/functions/merge_config.rb
+++ b/puppet/modules/service/lib/puppet/parser/functions/merge_config.rb
@@ -9,12 +9,12 @@
newfunction(:merge_config, :type => :rvalue, :arity => 2) do |args|
main_conf, service_conf = *args.map do |conf|
case conf
- when Hash
- conf.empty? ? '' : function_ordered_yaml([conf])
- when String
- conf
+ when Hash
+ conf.empty? ? '' : function_ordered_yaml([conf])
+ when String
+ conf
else
- ''
+ ''
end
end
main_conf += service_conf.split("\n").map do |line|
--
To view, visit https://gerrit.wikimedia.org/r/234496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d306e6d7e6affaacc45c911856f825fc1556575
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Zfilipin <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
