Merge branch 'dev' into merge-release/17.0-20251204132109

Author: as-op

.rubocop.yml

@@ -59,6 +59,9 @@ Layout/MultilineMethodCallIndentation:
 Layout/MultilineOperationIndentation:
   Enabled: false
 
+Lint/AmbiguousBlockAssociation:
+  AllowedMethods: [change]
+
 Lint/AmbiguousOperator:
   Enabled: false
 
@@ -98,19 +101,22 @@ Lint/UnderscorePrefixedVariableName:
 Lint/Void:
   Enabled: false
 
-Lint/AmbiguousBlockAssociation:
-  AllowedMethods: [change]
+Metrics/AbcSize:
+  Enabled: true
+  Exclude:
+    - "spec/**/*.rb"
+    - "modules/*/spec/**/*.rb"
 
-Metrics/ClassLength:
+Metrics/BlockLength:
   Enabled: false
 
-Metrics/CyclomaticComplexity:
+Metrics/BlockNesting:
   Enabled: false
 
-Metrics/BlockLength:
+Metrics/ClassLength:
   Enabled: false
 
-Metrics/BlockNesting:
+Metrics/CyclomaticComplexity:
   Enabled: false
 
 Metrics/MethodLength:
@@ -122,12 +128,6 @@ Metrics/ModuleLength:
 Metrics/ParameterLists:
   Enabled: false
 
-Metrics/AbcSize:
-  Enabled: true
-  Exclude:
-    - "spec/**/*.rb"
-    - "modules/*/spec/**/*.rb"
-
 Naming/AccessorMethodName:
   Enabled: false
 
@@ -150,36 +150,111 @@ Naming/VariableNumber:
     - '\w_20\d\d' # allow dates like christmas_2022 or date_2034_04_12
     - '\w\d++(_\d++)+' # allow hierarchical data like child1_2_5 (second + in regex is possessive qualifier)
     - 'custom_field_\d+' # allow custom field method names to be called with send :custom_field_1001
-# There are valid cases in which to use methods like:
-# * update_all
-# * touch_all
-Rails/SkipsModelValidations:
+
+OpenProject/AddPreviewForViewComponent:
+  Include:
+    - app/components/op_turbo/**.rb
+    - app/components/op_primer/**.rb
+    - app/components/open_project/**.rb
+    - app/components/concerns/**.rb
+
+Performance/Casecmp:
   Enabled: false
 
 # Don't force us to use tag instead of content_tag
 # as this breaks angular elements
 Rails/ContentTag:
   Enabled: false
 
+# dynamic finders cop clashes with capybara ID cop
+Rails/DynamicFindBy:
+  Enabled: true
+  Exclude:
+    - "spec/features/**/*.rb"
+    - "spec/support/**/*.rb"
+    - "modules/*/spec/features/**/*.rb"
+  Whitelist:
+    - find_by_login
+    - find_by_mail
+
+# Allow reorder to prevent find each cop triggering
+Rails/FindEach:
+  AllowedMethods:
+    - order
+    - reorder
+    - limit
+    - select
+    - lock
+
+# The http verbs in Rack::Test do not accept named parameters (params: params)
+Rails/HttpPositionalArguments:
+  Enabled: false
+
 # Disable I18n.locale = in specs, where it is reset
 # by us explicitly
 Rails/I18nLocaleAssignment:
   Enabled: true
   Exclude:
     - "spec/**/*.rb"
 
-# Do not bother if `let` statements use an index in their name
-RSpec/IndexedLet:
-  Enabled: false
-
-# The http verbs in Rack::Test do not accept named parameters (params: params)
-Rails/HttpPositionalArguments:
+# We have config.active_record.belongs_to_required_by_default = false ,
+# which means, we do have to declare presence validators on belongs_to relations.
+Rails/RedundantPresenceValidationOnBelongsTo:
   Enabled: false
 
 # require_dependency is an obsolete method for Rails applications running in Zeitwerk mode.
 Rails/RequireDependency:
   Enabled: true
 
+# Require save! to prevent saving without validation when saving outside of a condition.
+Rails/SaveBang:
+  Enabled: true
+
+# There are valid cases in which to use methods like:
+# * update_all
+# * touch_all
+Rails/SkipsModelValidations:
+  Enabled: false
+
+# Allow number HTTP status codes in specs
+RSpecRails/HttpStatus:
+  Enabled: false
+
+# expect not_to change is not working as expected
+# if you chain it with multiple expected changes
+RSpec/ChangeByZero:
+  Enabled: false
+
+RSpec/ContextWording:
+  Prefixes:
+    - and
+    - as
+    - even
+    - for
+    - given
+    - having
+    - if
+    - in
+    - "on"
+    - to
+    - unless
+    - via
+    - when
+    - with
+    - within
+    - without
+
+RSpec/DescribeClass:
+  Enabled: true
+  Exclude:
+    - "spec/features/**/*.rb"
+    - "modules/*/spec/features/**/*.rb"
+
+# Don't force the second argument of describe
+# to be .class_method or #instance_method
+RSpec/DescribeMethod:
+  Enabled: false
+
 # For feature specs, we tend to have longer specs that cover a larger part of the functionality.
 # This is done for multiple reasons:
 # * performance, as setting up integration tests is costly
@@ -191,48 +266,29 @@ RSpec/ExampleLength:
     - "spec/features/**/*.rb"
     - "modules/*/spec/features/**/*.rb"
 
-# We have specs that have no expect(..) syntax,
-# but only helper classes that expect themselves
-RSpec/NoExpectationExample:
-  Enabled: false
-
-RSpec/DescribeClass:
+# Prevent  "fit" or similar to be committed
+RSpec/Focus:
   Enabled: true
-  Exclude:
-    - "spec/features/**/*.rb"
-    - "modules/*/spec/features/**/*.rb"
 
 # Nothing wrong with `include_examples` when used properly.
 RSpec/IncludeExamples:
   Enabled: false
 
-# Allow number HTTP status codes in specs
-RSpecRails/HttpStatus:
+# Do not bother if `let` statements use an index in their name
+RSpec/IndexedLet:
   Enabled: false
 
-# dynamic finders cop clashes with capybara ID cop
-Rails/DynamicFindBy:
-  Enabled: true
-  Exclude:
-    - "spec/features/**/*.rb"
-    - "spec/support/**/*.rb"
-    - "modules/*/spec/features/**/*.rb"
-  Whitelist:
-    - find_by_login
-    - find_by_mail
+RSpec/LeadingSubject:
+  Enabled: false
 
-# Allow reorder to prevent find each cop triggering
-Rails/FindEach:
-  AllowedMethods:
-    - order
-    - reorder
-    - limit
-    - select
-    - lock
+# We use let!() to ensure dependencies are created
+# instead of let() and referencing them explicitly
+RSpec/LetSetup:
+  Enabled: false
 
-# We have config.active_record.belongs_to_required_by_default = false ,
-# which means, we do have to declare presence validators on belongs_to relations.
-Rails/RedundantPresenceValidationOnBelongsTo:
+# We have specs that have no expect(..) syntax,
+# but only helper classes that expect themselves
+RSpec/NoExpectationExample:
   Enabled: false
 
 # See RSpec/ExampleLength for why feature specs are excluded
@@ -249,11 +305,6 @@ RSpec/MultipleMemoizedHelpers:
 RSpec/NestedGroups:
   Enabled: false
 
-# Don't force the second argument of describe
-# to be .class_method or #instance_method
-RSpec/DescribeMethod:
-  Enabled: false
-
 # Don't force the second argument of describe
 # to match the exact file name
 RSpec/SpecFilePathFormat:
@@ -264,45 +315,9 @@ RSpec/SpecFilePathFormat:
     ICal: ical
   IgnoreMethods: true
 
-# Prevent  "fit" or similar to be committed
-RSpec/Focus:
-  Enabled: true
-
-# We use let!() to ensure dependencies are created
-# instead of let() and referencing them explicitly
-RSpec/LetSetup:
-  Enabled: false
-
-RSpec/LeadingSubject:
-  Enabled: false
-
 RSpec/NamedSubject:
   Enabled: false
 
-# expect not_to change is not working as expected
-# if you chain it with multiple expected changes
-RSpec/ChangeByZero:
-  Enabled: false
-
-RSpec/ContextWording:
-  Prefixes:
-    - and
-    - as
-    - even
-    - for
-    - given
-    - having
-    - if
-    - in
-    - "on"
-    - to
-    - unless
-    - via
-    - when
-    - with
-    - within
-    - without
-
 Style/Alias:
   Enabled: false
 
@@ -367,6 +382,19 @@ Style/FormatString:
 Style/FormatStringToken:
   AllowedMethods: [redirect]
 
+Style/FrozenStringLiteralComment:
+  Enabled: true
+  EnforcedStyle: always_true
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
 Style/GlobalVars:
   Enabled: false
 
@@ -409,6 +437,13 @@ Style/NilComparison:
 Style/Not:
   Enabled: false
 
+Style/NumericLiterals:
+  Enabled: false
+
+# Avoid enforcing "positive?"
+Style/NumericPredicate:
+  Enabled: false
+
 Style/OneLineConditional:
   Enabled: false
 
@@ -471,33 +506,3 @@ Style/WhileUntilModifier:
 
 Style/WordArray:
   Enabled: false
-
-Style/FrozenStringLiteralComment:
-  Enabled: true
-  EnforcedStyle: always_true
-
-Style/NumericLiterals:
-  Enabled: false
-
-# Avoid enforcing "positive?"
-Style/NumericPredicate:
-  Enabled: false
-
-Style/HashEachMethods:
-  Enabled: true
-
-Style/HashTransformKeys:
-  Enabled: true
-
-Style/HashTransformValues:
-  Enabled: true
-
-Performance/Casecmp:
-  Enabled: false
-
-OpenProject/AddPreviewForViewComponent:
-  Include:
-    - app/components/op_turbo/**.rb
-    - app/components/op_primer/**.rb
-    - app/components/open_project/**.rb
-    - app/components/concerns/**.rb

Gemfile

@@ -149,7 +149,7 @@ gem "structured_warnings", "~> 0.5.0"
 # don't require by default, instead load on-demand when actually configured
 gem "airbrake", "~> 13.0.0", require: false
 
-gem "markly", "~> 0.14" # another markdown parser like commonmarker, but with AST support used in PDF export
+gem "markly", "~> 0.15" # another markdown parser like commonmarker, but with AST support used in PDF export
 gem "md_to_pdf", git: "https://github.com/opf/md-to-pdf", ref: "6c565541bfa390c58d90d49aa9b487777704fc66"
 gem "prawn", "~> 2.4"
 gem "ttfunk", "~> 1.7.0" # remove after https://github.com/prawnpdf/prawn/issues/1346 resolved.
@@ -198,7 +198,7 @@ gem "aws-sdk-s3", "~> 1.205"
 
 gem "openproject-token", "~> 8.2.0"
 
-gem "plaintext", "~> 0.3.2"
+gem "plaintext", "~> 0.3.7"
 
 gem "ruby-progressbar", "~> 1.13.0", require: false
 
@@ -356,7 +356,7 @@ group :development, :test do
   gem "rubocop-factory_bot", require: false
   gem "rubocop-openproject", require: false
   gem "rubocop-performance", require: false
-  gem "rubocop-rails", "= 2.33.3", require: false # 2.33.4 has issues with Rails/ActionControllerFlashBeforeRender
+  gem "rubocop-rails", "2.34.2", require: false # 2.33.4 has issues with Rails/ActionControllerFlashBeforeRender
   gem "rubocop-rspec", require: false
   gem "rubocop-rspec_rails", require: false