1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-15 15:18:30 +09:00
Commit Graph

22049 Commits

Author SHA1 Message Date
Eugen Rochko
eccec92496 [Glitch] Change sidebar text in web UI
Port b9fd7571ae to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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 to glitch-soc

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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
renovate[bot]
c739b7f851
fix(deps): update dependency ws to v8.17.1 (#30733)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-17 09:13:07 +00:00
renovate[bot]
04d6cde393
chore(deps): update devdependencies (non-major) (#30735)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-17 09:13:07 +00:00
Renaud Chaput
43bbdea421
Fix invalid mask-icon when a custom instance icon is configured (#30734) 2024-06-17 09:00:26 +00:00
renovate[bot]
5addffb604
chore(deps): update dependency public_suffix to v5.1.1 (#30725)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-17 08:57:49 +00:00
renovate[bot]
dd5fc5329e
chore(deps): update dependency memory_profiler to v1.0.2 (#30737)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-17 08:56:33 +00:00
renovate[bot]
e80710fae6
chore(deps): update dependency rubocop-performance to v1.21.1 (#30731)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-17 08:44:58 +00:00
Michael Stanclift
a777f7e3cc
Restore short Ruby version on admin dashboard (#30711) 2024-06-14 16:10:16 +00:00
Matt Jankowski
2b10b0e027
Reduce docker service container health check wait times (#30703) 2024-06-14 15:49:08 +00:00
Michael Stanclift
4a5442edaa
Add ffmpeg and ImageMagick versions to admin dashboard (#30710) 2024-06-14 15:36:57 +00:00
renovate[bot]
09dca8ba3d
chore(deps): update dependency fog-openstack to v1.1.3 (#30671)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-14 13:24:26 +00:00
Eugen Rochko
b9fd7571ae
Change sidebar text in web UI (#30696) 2024-06-14 13:04:20 +00:00
Claire
8eb27c60e1
Add most_recent_notification_id to NotificationGroup (#30707) 2024-06-14 10:33:06 +00:00
Matt Jankowski
b5d1d48266
Convert form_for -> form_with in views (#30700) 2024-06-14 09:54:22 +00:00
Matt Jankowski
980034e2e1
Fix Style/NilLambda cop in paperclip initializer (#30695) 2024-06-14 09:50:50 +00:00
Matt Jankowski
222ab80557
Fix Style/GlobalStdStream cop in environments/* files (#30694) 2024-06-14 09:50:33 +00:00
Matt Jankowski
ab8474fd7f
Fix (relax) remaining RSpec/* cops (#30693) 2024-06-14 09:49:49 +00:00
Matt Jankowski
8d5ed19c6d
Migrate form_tag to form_with in admin and auth views (#30692) 2024-06-14 09:49:10 +00:00
github-actions[bot]
a7264a2b42
New Crowdin Translations (automated) (#30704)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-14 09:08:17 +00:00
renovate[bot]
e1f8cd5b0f
chore(deps): update dependency aws-sdk-s3 to v1.152.3 (#30701)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-14 08:14:00 +00:00
Emelia Smith
3d9f00ae16
Fix unsafe URLs in audit log resulting from domain blocks (#27139)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-06-14 07:54:09 +00:00
Marcin Mikołajczak
a243963e93
LanguageDropdown: remove unused function (#30346)
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-06-13 19:46:45 +00:00
Michael Stanclift
179f7b11ba
Build libvips from source in Dockerfile (#30571) 2024-06-13 15:58:34 +00:00
Matt Jankowski
a66f6e1005
Add binstub for brakeman (#30493) 2024-06-13 15:07:02 +00:00
renovate[bot]
f8ce61d670
chore(deps): update dependency nokogiri to v1.16.6 (#30689)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-13 14:37:54 +00:00
Matt Jankowski
271a8e99e2
Update merge conflict rebase action version (silences node version warning) (#30690) 2024-06-13 14:37:49 +00:00
Louis Brauer
f0ca874b09
Include crossorigin in inert css (#30687) 2024-06-13 14:37:43 +00:00
Matt Jankowski
3a191b3797
Add rubocop binstub, simplify configuration (#30407) 2024-06-13 14:27:17 +00:00
Claire
45abddb302
Fix pagination attributes not being returned in ungroupable-only pages (#30688) 2024-06-13 14:10:34 +00:00
github-actions[bot]
dd587d29b6
New Crowdin Translations (automated) (#30684)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-13 13:30:07 +00:00
Matt Jankowski
8889816a51
Use stock ruby environment on CI lint tasks (#30657) 2024-06-13 13:23:32 +00:00
Matt Jankowski
3b7c50abca
Remove bundler-audit ignore config (#30672) 2024-06-13 13:15:32 +00:00
renovate[bot]
474dda7027
chore(deps): update dependency aws-sdk-s3 to v1.152.2 (#30680)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-13 13:15:01 +00:00
renovate[bot]
64fc17352b
chore(deps): update dependency sanitize to v6.1.1 (#30683)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-13 13:13:06 +00:00
Eugen Rochko
ed6d24330b
Add author links on the explore page in web UI (#30521) 2024-06-13 13:04:16 +00:00
Claire
37f53542fe
Fix limit handling in grouped notifications CTE (#30685) 2024-06-13 12:42:40 +00:00
renovate[bot]
fe74045576
chore(deps): update dependency ruby to v3.3.3 (#30667)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-13 08:26:17 +00:00
Matt Jankowski
b379dc156e
Update parser to version 3.3.3.0 (#30676) 2024-06-13 08:26:09 +00:00