Claire
1474318691
Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main
...
Conflicts:
- `app/models/trends/statuses.rb`:
Upstream fixed a bug in the trending post condition.
Glitch-soc's condition is different because we potentially allow CWed content
to trend.
Ported upstream's fix while keeping glitch-soc's change.
- `config/initializers/content_security_policy.rb`:
Kept our version for now, we will switch to upstream later down the road.
2023-12-17 15:32:29 +01:00
Essem
dfe6628e4b
Add new emojis from jdecked/twemoji
15.0
2023-12-16 16:25:22 -06:00
Matt Jankowski
b1dec09d20
Fix Style/InverseMethods
cop ( #28377 )
2023-12-15 15:52:00 +00:00
Matt Jankowski
3e336fe706
Opt out of Rails/SkipsModelValidations
cop in db/migrate ( #28371 )
2023-12-15 14:38:12 +00:00
Matt Jankowski
e5717c9bc6
Fix Style/Lambda
cop ( #28378 )
2023-12-15 14:34:24 +00:00
Matt Jankowski
1ee8d1e50e
Assign a proc to Rack::Request.ip_filter
instead of patching method ( #28380 )
2023-12-15 14:33:56 +00:00
Matt Jankowski
db897eaa5a
Unwind map
on single-item array in spec/services/delete_account_service
spec ( #28358 )
2023-12-14 14:07:54 +00:00
Matt Jankowski
e17faedffb
Move default meta
options from InitialStateSerializer
to private method (AbcSize reduction) ( #28355 )
2023-12-14 14:04:55 +00:00
Matt Jankowski
1c3b5f4a78
Fix reference to non-existent var in CLI maintenance command ( #28363 )
2023-12-14 14:02:33 +00:00
Matt Jankowski
ef9797a395
Un-nest contexts in settings/2fa/webauthn
spec ( #28359 )
2023-12-14 10:46:43 +00:00
Matt Jankowski
adbfd40a1b
Convert api/v1/directories
controller spec to request spec ( #28356 )
2023-12-14 10:38:06 +00:00
Matt Jankowski
cd9ebf5f0f
Update stylelint to version 16.0.2 ( #28354 )
2023-12-14 10:35:54 +00:00
Matt Jankowski
28e1a7a394
Improve spec coverage for models/announcement
class ( #28350 )
2023-12-14 10:29:10 +00:00
renovate[bot]
d791b47058
Update dependency chewy to v7.4.0 ( #28349 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-14 10:26:28 +00:00
Matt Jankowski
8a3d8c6c14
Remove the stub_stdout
wrapper around CLI specs ( #28340 )
2023-12-13 10:14:19 +00:00
renovate[bot]
3a59365e40
Update dependency test-prof to v1.3.1 ( #28342 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-13 09:52:43 +00:00
renovate[bot]
49150e2f1d
Update dependency ws to v8.15.1 ( #28343 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-13 09:52:40 +00:00
github-actions[bot]
b2f915b31a
New Crowdin Translations (automated) ( #28344 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-13 09:52:37 +00:00
renovate[bot]
aae4b5644f
Update dependency haml_lint to v0.52.0 ( #28345 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-13 09:52:33 +00:00
Claire
dcc24db793
Fix N+1s because of association preloaders not actually getting called ( #28339 )
2023-12-13 07:47:32 +00:00
Essem
1ef832e0dc
Allow polls with one option
2023-12-12 20:52:01 -06:00
Essem
00dae881c5
Merge remote-tracking branch 'upstream/main'
2023-12-12 20:30:34 -06:00
Claire
b7248485b1
Merge pull request #2477 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 2e6bf60f15
2023-12-12 19:45:18 +01:00
Claire
3f1ec16377
Fix empty column explainer getting cropped under certain conditions ( #28337 )
2023-12-12 14:31:37 +00:00
renovate[bot]
db3220ff77
Update dependency rubocop to v1.59.0 ( #28320 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-12 14:18:30 +00:00
Claire
f37c93f3d7
Change cookie rotator to use SHA1 digest for new cookies ( #27392 )
2023-12-12 12:01:08 +00:00
Claire
393e851649
Change Rails' cache format to 7.0 ( #27393 )
2023-12-12 12:00:23 +00:00
Matt Jankowski
4a7395d989
Add migrator_version
method to CLI maintenance script ( #28323 )
2023-12-12 11:56:39 +00:00
renovate[bot]
ca51e41239
Update dependency stylelint-config-standard-scss to v12 ( #28333 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-12 11:45:39 +00:00
github-actions[bot]
14e64bc880
New Crowdin Translations (automated) ( #28334 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-12 11:45:10 +00:00
renovate[bot]
8078520c76
Update dependency oj to v3.16.3 ( #28332 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-12 10:40:54 +00:00
Claire
89a496b42f
Fix status edits not always being streamed to mentioned users ( #28324 )
2023-12-12 10:39:21 +00:00
Claire
a8a5c6514f
Fix LinkCrawlWorker
error when encountering empty OEmbed response ( #28268 )
2023-12-12 08:29:46 +00:00
Matt Jankowski
2c6369918c
Fix Style/RedundantArgument
cop ( #28321 )
2023-12-11 14:58:29 +00:00
renovate[bot]
9dfa940636
Update babel monorepo to v7.23.6 ( #28319 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-11 14:58:10 +00:00
Claire
f3864db409
Fix notification sounds ( #28316 )
2023-12-11 14:23:30 +00:00
Matt Jankowski
b5a1013ae3
Combine CLI::...
spec example subjects ( #28285 )
2023-12-11 10:23:45 +00:00
renovate[bot]
4ad2e87c48
Update dependency debug to v1.9.0 ( #28315 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-11 08:45:30 +00:00
github-actions[bot]
79a81da69c
New Crowdin Translations (automated) ( #28291 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-11 08:22:52 +00:00
Matt Jankowski
0e4233de9d
Controller spec to request spec: api/v2/suggestions
( #28297 )
2023-12-11 08:13:57 +00:00
Matt Jankowski
0c64092500
Controller spec to request spec: api/v1/accounts/search
( #28299 )
2023-12-11 08:13:28 +00:00
Matt Jankowski
253393f3a8
Only attempt to remove indexes that exist in CLI::Maintenance
script ( #28286 )
2023-12-11 08:04:45 +00:00
renovate[bot]
f5d6143aa1
Update dependency addressable to v2.8.6 ( #28296 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-11 08:01:17 +00:00
Matt Jankowski
16ede59d0a
Controller spec to request spec: api/v1/featured_tags/suggestions
( #28298 )
2023-12-11 08:00:41 +00:00
Matt Jankowski
809506bdd4
Controller spec to request spec: api/v1/accounts/pins
( #28300 )
2023-12-11 07:59:40 +00:00
Matt Jankowski
94cc707ab3
Controller spec to request spec: api/v1/accounts/notes
( #28301 )
2023-12-11 07:58:48 +00:00
Matt Jankowski
e544b6df42
Controller spec to request spec: api/v1/accounts/lookup
( #28302 )
2023-12-11 07:57:33 +00:00
Matt Jankowski
a968898dc7
Controller spec to request spec: api/v1/accounts/lists
( #28303 )
2023-12-11 07:56:47 +00:00
Matt Jankowski
8f94502e7d
Controller spec to request spec: api/v1/accounts/identify_proofs
( #28304 )
2023-12-11 07:56:13 +00:00
Matt Jankowski
78347d2556
Controller spec to request spec: api/v1/accounts/familiar_followers
( #28305 )
2023-12-11 07:55:45 +00:00