Jeremy Kescher
f22da34908
Fix indentation of CHANGELOG
2024-06-19 18:54:20 +02:00
Jeremy Kescher
f883c171fb
Bump Catstodon revision to 1.1.1
2024-06-19 17:56:52 +02:00
Jeremy Kescher
5e5f19b50e
Merge branch 'refs/heads/glitch' into develop
2024-06-19 17:49:06 +02: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
Jeremy Kescher
3f2e2c0923
Merge branch 'refs/heads/glitch' into develop
2024-06-19 17:20:56 +02:00
Essem
8e8cf36666
Turn custom emoji regexps into class level constants
2024-06-19 17:19:18 +02: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
Jeremy Kescher
1a0ea16128
README.md: Add note about MASTODON_USE_LIBVIPS
2024-06-18 01:55:35 +02:00
Jeremy Kescher
d220eaab0a
Bump Catstodon revision to 1.1.0
2024-06-18 01:17:19 +02:00
Jeremy Kescher
3fa67cbe7a
Make MASTODON_USE_LIBVIPS default to true
2024-06-18 01:15:03 +02:00
Jeremy Kescher
e53b002379
CHANGELOG.md: Add note about ruby 3.3.3.
2024-06-18 00:18:20 +02:00
Jeremy Kescher
29ac8c0606
Merge branch 'refs/heads/glitch-soc' into develop
2024-06-18 00:15:52 +02:00
Jeremy Kescher
d0cf3e51db
CHANGELOG.md: Add clarification about dates being UTC
2024-06-18 00:10:40 +02:00
Jeremy Kescher
463585fc3c
Bump Catstodon revision to 1.0.3
2024-06-17 22:55:11 +02: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
Jeremy Kescher
895b479c23
Merge branch 'refs/heads/glitch-soc' into develop
2024-06-17 22:52:08 +02:00
Essem
83f07c7d9b
Disable reactions in detailed status view when visibleReactions is 0
2024-06-17 22:50:11 +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
Michael Stanclift
d5f02adad7
Add option to use native Ruby driver for Redis ( #30717 )
2024-06-17 12:28:01 +00:00
Matt Jankowski
d7b7617321
Use class_names in admin/account_moderation_notes helper ( #30719 )
2024-06-17 12:20:57 +00:00
github-actions[bot]
35d52d7914
New Crowdin Translations (automated) ( #30723 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-17 12:13:23 +00:00
Eugen Rochko
fd3697723c
[Glitch] Add author links on the explore page in web UI
...
Port ed6d24330b
2024-06-17 14:08:08 +02:00
Eugen Rochko
454dc407f4
[Glitch] Fix a few visual glitches with link previews in web UI
...
Port 9984243467
2024-06-17 13:56:23 +02:00
Claire
677f73f793
Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream
2024-06-17 13:41:58 +02:00
Claire
68c9fa8fcc
Merge pull request #2742 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to d818ddd687
2024-06-17 13:38:38 +02:00
renovate[bot]
f195c46635
chore(deps): update dependency irb to v1.13.2 ( #30727 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-17 10:22:05 +00:00
Matt Jankowski
f287462f76
Fix repeated Delete/Undo assertion in remove status service spec ( #30715 )
2024-06-17 10:21:29 +00:00
