tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main

Browse Source 
Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
This commit is contained in:
Claire
2023-08-13 18:47:15 +02:00
parent 678fa1e6af 121443c0fc
commit 6530f9709c
194 changed files with 3931 additions and 2110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.rubocop_todo.yml
View File

@@ -135,7 +135,7 @@ Lint/UselessAssignment:
# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
Metrics/AbcSize:
Max: 143
Max: 146
Exclude:
- 'app/serializers/initial_state_serializer.rb'