Claire
1090611529
Merge pull request #2751 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to bb2d77b4a0
2024-06-21 17:05:45 +02:00
Renaud Chaput
2f994bb34a
[Glitch] Fix error when deleting a status
...
Port 7d12522ed7
2024-06-21 12:03:35 +02:00
Claire
6300273664
Merge commit '9e932fa1ddaea569ca52fe663eb4bb13a5a43e0a' into glitch-soc/merge-upstream
2024-06-21 12:02:42 +02:00
github-actions[bot]
9e932fa1dd
New Crowdin Translations (automated) ( #30789 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-21 09:14:44 +00:00
Renaud Chaput
7d12522ed7
Fix error when deleting a status ( #30784 )
2024-06-20 22:39:06 +00:00
Renaud Chaput
8ae61fdee5
[Glitch] Convert disconnectTimeline and timelineDelete actions to Typescript
...
Port 1c65932776
2024-06-20 19:22:24 +02:00
Claire
fd867adffe
Merge commit 'bb2d77b4a07e95e7d96df080f2d6994c1422b0c0' into glitch-soc/merge-upstream
2024-06-20 18:36:13 +02:00
Claire
1a88f6d97d
Merge pull request #2750 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 27529247b2
2024-06-20 18:35:43 +02:00
Claire
bb2d77b4a0
Change /api/v2_alpha/notifications to only return historical data in pages ( #30781 )
2024-06-20 15:54:50 +00:00
Nick Schonning
6ab6146c0b
Remove --no-exclude-limit for RuboCop ToDo ( #30427 )
2024-06-20 15:30:49 +00:00
Claire
f723370c69
Fix missing account_warning delegation in NotificationGroup ( #30779 )
2024-06-20 13:44:49 +00:00
Renaud Chaput
c97e798d8c
[Glitch] Improve createdataLoadingThunk
...
Port 27529247b2
2024-06-20 13:57:58 +02:00
Claire
04e57efa55
Merge commit '27529247b289a0e78d2deb97626ddb60baf04d86' into glitch-soc/merge-upstream
2024-06-20 13:57:08 +02:00
Renaud Chaput
1c65932776
Convert disconnectTimeline and timelineDelete actions to Typescript ( #30777 )
2024-06-20 11:56:52 +00:00
Renaud Chaput
27529247b2
Improve createdataLoadingThunk ( #30778 )
2024-06-20 11:42:10 +00:00
Claire
7889e983fb
Add group_key attribute to NotificationSerializer ( #30776 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-06-20 11:05:25 +00:00
github-actions[bot]
a0910cd49c
New Crowdin Translations (automated) ( #30772 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-20 09:03:28 +00:00
renovate[bot]
cb7121e5a9
chore(deps): update dependency rspec-rails to v6.1.3 ( #30770 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-20 07:42:28 +00:00
Claire
7a29b1ed46
Merge pull request #2749 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 2cda1dd542
2024-06-20 08:37:18 +02:00
Claire
cabd7c21fc
Merge commit '2cda1dd542b20a47245cb8d28a4f6f8750c2284c' into glitch-soc/merge-upstream
2024-06-19 19:37:37 +02:00
Claire
2cda1dd542
Fix compatibility with Redis < 6.2 again ( #30412 )
2024-06-19 16:59:37 +00:00
Claire
0c2b1f56ef
Merge pull request #2748 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 5f4d231e98
2024-06-19 17:28:25 +02:00
Matt Jankowski
84a31319e9
Add match_json_values and use in AP worker specs ( #30720 )
2024-06-19 13:46:52 +00:00
Nick Schonning
53776cd58f
Enable passing ESLint rules ( #30726 )
2024-06-19 13:42:36 +00:00
Claire
52e34a6bd6
Merge commit '5f4d231e980665c0946297909df508269fb25dc6' into glitch-soc/merge-upstream
2024-06-19 11:59:06 +02:00
Matt Jankowski
5f4d231e98
Use rubocop DisplayCopNames and UseCache defaults (true) ( #30750 )
2024-06-19 09:34:24 +00:00
renovate[bot]
49b323c13d
fix(deps): update dependency cssnano to v7.0.3 ( #30764 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-19 09:31:56 +00:00
Claire
8098d27f84
Stop calling Webpacker in full-stack tests ( #30763 )
2024-06-19 09:31:30 +00:00
Matt Jankowski
556d409780
Enable renovate lockFileMaintenance setting ( #30732 )
2024-06-19 09:08:04 +00:00
renovate[bot]
4e7e31538f
chore(deps): update opentelemetry-ruby (non-major) ( #30755 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-19 08:45:51 +00:00
Matt Jankowski
a8b3d2e4e4
Consolidate time periods methods into base measure ( #30757 )
2024-06-19 08:45:47 +00:00
github-actions[bot]
80743e0e7f
New Crowdin Translations (automated) ( #30762 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-19 08:45:40 +00:00
Matt Jankowski
be19b94dea
Unpluralize mistakenly changed privacy template ( #30759 )
2024-06-18 21:34:17 +00:00
Claire
3bc513c06b
Merge pull request #2747 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 58ace2e45e
2024-06-18 19:25:49 +02:00
Renaud Chaput
af0a1a8774
[Glitch] Convert notifications policies frontend code to Typescript
...
Port d558dfd77d
2024-06-18 18:22:40 +02:00
Claire
b0c979af49
Merge commit '58ace2e45e16a69977267d03874568c11043f04c' into glitch-soc/merge-upstream
2024-06-18 18:20:36 +02:00
Claire
58ace2e45e
Fix SQL error in admin measures API ( #30753 )
2024-06-18 16:04:58 +00:00
Michael Stanclift
d97fcd0cbb
Build ffmpeg from source in Dockerfile ( #30569 )
2024-06-18 14:51:51 +00:00
Renaud Chaput
d558dfd77d
Convert notifications policies frontend code to Typescript ( #29868 )
2024-06-18 13:23:30 +00:00
github-actions[bot]
50db95b9a1
New Crowdin Translations (automated) ( #30746 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-18 12:39:36 +00:00
renovate[bot]
689ba28b07
chore(deps): update docker/dockerfile docker tag to v1.8 ( #30736 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-18 12:24:14 +00:00
renovate[bot]
81f95cf08e
fix(deps): update dependency sass to v1.77.6 ( #30745 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-18 12:20:43 +00:00
Matt Jankowski
7db3509a1f
Remove comment for ruby-core-extracted gem ( #30740 )
2024-06-18 12:20:23 +00:00
Matt Jankowski
238dd23214
Remove already configured excludes from .rubocop.yml ( #30741 )
2024-06-18 12:16:37 +00:00
Matt Jankowski
38c6825eda
Remove unused Extractor#extract_cashtags_with_indices method ( #30742 )
2024-06-18 12:16:16 +00:00
Claire
18d9601464
Merge pull request #2744 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to d5f02adad7
2024-06-17 22:53:03 +02:00
Eugen Rochko
eccec92496
[Glitch] Change sidebar text in web UI
...
Port b9fd7571ae
2024-06-17 18:35:10 +02:00
Claire
395b9011ee
Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream
...
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.
2024-06-17 18:30:28 +02:00
Marcin Mikołajczak
f0dba9af6f
[Glitch] LanguageDropdown: remove unused function
...
Port a243963e93
2024-06-17 18:22:00 +02:00
Claire
8089fa6935
Merge commit 'a7264a2b42631bd876d114b96f689492e2908a8d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/application.html.haml`:
Conflict because of glitch-soc's different theming system.
Ported upstream's change.
2024-06-17 18:14:14 +02:00
