diff --git a/Rakefile b/Rakefile index 80c7163..8f97db8 100644 --- a/Rakefile +++ b/Rakefile @@ -61,7 +61,10 @@ namespace :build do aggregation = src.reduce({}) do |acc, file| full_path = path_in_project(file) y = YAML.safe_load(File.read(full_path)) - acc.deep_merge(y) + acc.deep_merge!( + y, + extend_existing_arrays: true, + ) end target_full_path = path_in_project(to) diff --git a/ci/rubocop.rails.yml b/ci/rubocop.rails.yml index 95194e7..2a447ef 100644 --- a/ci/rubocop.rails.yml +++ b/ci/rubocop.rails.yml @@ -78,7 +78,7 @@ Style/ClassVars: StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-class-vars Enabled: false Style/CollectionMethods: - Enabled: true + Enabled: false PreferredMethods: find: detect inject: reduce @@ -232,7 +232,7 @@ Naming/BinaryOperatorParameterName: StyleGuide: https://github.com/bbatsov/ruby-style-guide#other-arg Enabled: false Metrics/ParameterLists: - Description: Avoid parameter lists longer than three or four parameters. + Description: Avoid long parameter lists. StyleGuide: https://github.com/bbatsov/ruby-style-guide#too-many-params Enabled: true Max: 5 @@ -355,7 +355,7 @@ Layout/ConditionPosition: Layout/DotPosition: Description: Checks the position of the dot in multi-line method calls. StyleGuide: https://github.com/bbatsov/ruby-style-guide#consistent-multi-line-chains - EnforcedStyle: trailing + EnforcedStyle: leading Layout/ExtraSpacing: Description: Do not use unnecessary spacing. Enabled: true diff --git a/ci/rubocop.yml b/ci/rubocop.yml index 7929e40..39a13f7 100644 --- a/ci/rubocop.yml +++ b/ci/rubocop.yml @@ -75,7 +75,7 @@ Style/ClassVars: StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-class-vars Enabled: false Style/CollectionMethods: - Enabled: true + Enabled: false PreferredMethods: find: detect inject: reduce @@ -229,7 +229,7 @@ Naming/BinaryOperatorParameterName: StyleGuide: https://github.com/bbatsov/ruby-style-guide#other-arg Enabled: false Metrics/ParameterLists: - Description: Avoid parameter lists longer than three or four parameters. + Description: Avoid long parameter lists. StyleGuide: https://github.com/bbatsov/ruby-style-guide#too-many-params Enabled: true Max: 5 @@ -352,7 +352,7 @@ Layout/ConditionPosition: Layout/DotPosition: Description: Checks the position of the dot in multi-line method calls. StyleGuide: https://github.com/bbatsov/ruby-style-guide#consistent-multi-line-chains - EnforcedStyle: trailing + EnforcedStyle: leading Layout/ExtraSpacing: Description: Do not use unnecessary spacing. Enabled: true