mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,827 Commits
69 Branches
20 Tags
354 MiB
Commit Graph

21827 Commits (60c2310fd879885755c620b060828e3d6a560e0b)

Author SHA1 Message Date
Claire 60c2310fd8
Merge pull request #2719 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to ccb6aeddac
 2024-05-25 19:26:23 +02:00
Claire 1a2a28eb4a Fix rubocop warnings 2024-05-24 17:13:34 +02:00
Renaud Chaput e947f1f2ed [Glitch] Fix a leftover argument to `api()` 
Port 8ea2726376 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-24 17:09:49 +02:00
Claire d76106da12 Merge commit 'ccb6aeddacbab950d7d7f1b0d2b64212d7aa99eb' into glitch-soc/merge-upstream 2024-05-24 17:08:21 +02:00
renovate[bot] ccb6aeddac
fix(deps): update babel monorepo to v7.24.6 (#30415) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-24 14:44:03 +00:00
renovate[bot] 33350cde96
chore(deps): update dependency webmock to v3.23.1 (#30414) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-24 14:44:00 +00:00
Renaud Chaput acc77c3836
Add instrumentation to the search services (#30350) 2024-05-24 13:13:23 +00:00
renovate[bot] 8394a150d7
chore(deps): update dependency rubocop to v1.64.0 (#30404) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-24 09:01:42 +00:00
Matt Jankowski 9b5055d34d
Fix `Style/SuperArguments` cop (#30406) 2024-05-24 08:36:21 +00:00
renovate[bot] 9305caf1fd
fix(deps): update dependency glob to v10.4.1 (#30411) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-24 08:27:11 +00:00
github-actions[bot] 54351d01f2
New Crowdin Translations (automated) (#30410) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-24 08:26:38 +00:00
renovate[bot] 52a7d053ff
fix(deps): update dependency postcss-preset-env to v9.5.14 (#30409) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-24 08:26:07 +00:00
Renaud Chaput 8ea2726376
Fix a leftover argument to `api()` (#30405) 2024-05-24 08:25:42 +00:00
Claire ef01546957
Merge pull request #2718 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to b6fd14f0e2
 2024-05-23 22:41:09 +02:00
Renaud Chaput e32bfad88a [Glitch] Fix `createDataLoadingThunk` and related actions 
Port b6fd14f0e2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-23 20:37:00 +02:00
Renaud Chaput 8d6058b40a [Glitch] Proposal: a modern & typed way of writing Redux actions doing API requests 
Port 10ec421dd4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-23 20:33:05 +02:00
Claire 51631c785f Merge commit 'b6fd14f0e2842eca269ef8962e3c5bd560a76357' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/activitypub/parser/status_parser.rb`:
  Glitch-soc had changes to adjacent lines.
  Ported upstream's changes.
 2024-05-23 20:30:23 +02:00
Renaud Chaput b6fd14f0e2
Fix `createDataLoadingThunk` and related actions (#30408) 2024-05-23 18:22:42 +00:00
Renaud Chaput c465ef7560 [Glitch] Fix some API calls that should not use an API token 
Port 15d3070754 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-23 20:11:20 +02:00
Claire 0e8633f6c7 Merge commit '3a862439dfc989c6c5741e007c2f4e0335fffe33' into glitch-soc/merge-upstream 2024-05-23 20:11:12 +02:00
Claire 133d98fb25
Normalize language code of incoming posts (#30403) 2024-05-23 17:28:18 +00:00
Renaud Chaput 10ec421dd4
Proposal: a modern & typed way of writing Redux actions doing API requests (#30270) 2024-05-23 09:50:13 +00:00
Matt Jankowski 3a862439df
Remove unused account record in api/v2/admin/accounts spec (#30397) 2024-05-23 08:26:58 +00:00
github-actions[bot] 5b5a35cf96
New Crowdin Translations (automated) (#30402) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-23 08:26:29 +00:00
Renaud Chaput 15d3070754
Fix some API calls that should not use an API token (#30401) 2024-05-23 07:30:48 +00:00
Claire 6f884b6305
Merge pull request #2717 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 2c5ab8f647
 2024-05-22 22:04:05 +02:00
Renaud Chaput 3e9298370d [Glitch] Remove the access token from Redux & context 
Port 2c5ab8f647 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-22 21:14:54 +02:00
Claire 22d12229b2 Merge commit '2c5ab8f647841ea8075ece50ccc9e12c21af8720' into glitch-soc/merge-upstream 2024-05-22 21:05:19 +02:00
Renaud Chaput 2c5ab8f647
Remove the access token from Redux & context (#30275) 2024-05-22 14:45:18 +00:00
Michael Stanclift 2c75cf8599
Add "Warning preset" link to admin navigation (#26199) 2024-05-22 09:05:33 +00:00
github-actions[bot] a2b4c29c8f
New Crowdin Translations (automated) (#30394) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-22 07:57:51 +00:00
renovate[bot] d9d4ba1b6f
fix(deps): update dependency glob to v10.3.16 (#30392) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-22 07:47:49 +00:00
renovate[bot] 6e67ca73f3
fix(deps): update dependency axios to v1.7.2 (#30372) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-22 07:35:27 +00:00
Claire 65db9dec2e
Merge pull request #2716 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to cd0c547936
 2024-05-21 20:04:34 +02:00
David Lapshin dc35563f65 [Glitch] Fix announcements icon rotating like settings one 
Port cd0c547936 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-21 17:45:59 +02:00
Claire 5ab111554e Merge commit 'cd0c5479362260082dbe1cbc42e364017853bbfc' into glitch-soc/merge-upstream 2024-05-21 17:45:21 +02:00
Claire 40a3a3f3d8
Merge pull request #2715 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 89f89d738f
 2024-05-21 17:44:40 +02:00
David Lapshin cd0c547936
Fix announcements icon rotating like settings one (#30388) 2024-05-21 15:24:51 +00:00
Claire 32223863a5
Add coverage to `/admin/accounts/:id` (#30386) 2024-05-21 13:17:34 +00:00
Claire edf6ca56e3 Fix rubocop error and cleanup `Status.as_direct_timeline` a little 2024-05-21 13:12:46 +02:00
Claire d3136e6d58 Merge commit '89f89d738f5840c80ff938f8bf6734cdafe0fa83' into glitch-soc/merge-upstream 2024-05-21 12:06:38 +02:00
Claire 89f89d738f
Revert "Allow unblocking email addresses from any matching account (#29305)" (#30385) 2024-05-21 08:56:08 +00:00
github-actions[bot] eda2bdfc7a
New Crowdin Translations (automated) (#30383) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-21 08:48:36 +00:00
Claire e853355f24
Merge pull request #2714 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 0a2110b9af
 2024-05-20 20:23:13 +02:00
renovate[bot] 0663c7d78d
fix(deps): update formatjs monorepo (#30359) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-20 17:14:10 +00:00
renovate[bot] 8c925dec79
chore(deps): update dependency rubocop-rails to v2.25.0 (#30341) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-20 17:04:21 +00:00
Claire 20fdf8e22c Merge commit '0a2110b9af52005798251dc9d245a66dd5dd20fa' into glitch-soc/merge-upstream 2024-05-20 17:47:48 +02:00
Claire 7b3eef4cb1
Merge pull request #2713 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to de4815afda
 2024-05-20 17:27:55 +02:00
Matt Jankowski 0a2110b9af
Add coverage for custom filters (#30347) 2024-05-20 15:00:09 +00:00
Claire 00cf8d3748
Change older Paperclip database migrations for consistency (#30204) 2024-05-20 14:59:27 +00:00