mirror/blueb-Chuckya-fe-standalone
1
0
Fork 0
mirror of https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git synced 2026-01-11 13:33:21 -08:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit 'd5f02adad7' into glitch-soc/merge-upstream

Browse source 
Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, just upstream adding a method textually adjacent to
  glitch-soc only code.
  Ported upstream's change.
This commit is contained in:
Claire 2024-06-17 18:30:28 +02:00
commit 395b9011ee
158 changed files with 559 additions and 513 deletions
Download patch file Download diff file Expand all files Collapse all files

15
.rubocop_todo.yml
View file

@ -27,21 +27,6 @@ Metrics/CyclomaticComplexity:
Metrics/PerceivedComplexity:
Max: 27
# Configuration parameters: CountAsOne.
RSpec/ExampleLength:
Max: 18
RSpec/MultipleExpectations:
Max: 7
# Configuration parameters: AllowSubject.
RSpec/MultipleMemoizedHelpers:
Max: 17
# Configuration parameters: AllowedGroups.
RSpec/NestedGroups:
Max: 6
Rails/OutputSafety:
Exclude:
- 'config/initializers/simple_form.rb'