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

22305 Commits (64b2c712d4318445716a1f3f6e77fd005d07a7d9)

Author SHA1 Message Date
Claire 64b2c712d4 Merge commit '9d0bce40724eb77b7cc3917091b62e4ab159e29e' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict because upstream refactored theme-related code, and glitch-soc has
  a different theming system.
 2024-07-15 18:51:38 +02:00
David Roetzel 9d0bce4072
Move filtered notifications bar in scrollable area (#30996) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-15 13:42:47 +00:00
renovate[bot] 0b97ec3f7b
fix(deps): update dependency @babel/core to v7.24.9 (#31029) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-15 13:03:57 +00:00
Matt Jankowski 543b59fa14
Clean up `theme_helper` style builders (#30617) 2024-07-15 13:03:23 +00:00
Matt Jankowski 91ef4a6fc5
Add assertion about key columns to account key generate spec (#30635) 2024-07-15 10:42:18 +00:00
Claire 1dd8262071
Add optional `filtered` attribute to notification entities in REST API (#31011) 2024-07-15 09:29:57 +00:00
github-actions[bot] 17117109ad
New Crowdin Translations (automated) (#31018) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-15 07:44:37 +00:00
mogaminsk d61b536df3
Add i18n strings for instance favicon and logo settings label (#31016) 2024-07-15 07:38:48 +00:00
Claire d329eda295
Merge pull request #2776 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 00cb4a0313
 2024-07-14 19:40:29 +02:00
Claire edec2e9fdf Merge commit '00cb4a0313190bfa118966692a649db9c8328094' into glitch-soc/merge-upstream 2024-07-14 18:43:35 +02:00
Claire 54642244ed
Merge pull request #2775 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to c929b4cace
 2024-07-12 17:14:23 +02:00
Matt Jankowski 00cb4a0313
Avoid repeated factory creation in media_attachments_vacuum_spec (#31000) 2024-07-12 14:09:16 +00:00
Emelia Smith c953dca1de
Streaming: use pgPool.query instead of manually acquiring & releasing a connection (#30964) 2024-07-12 12:23:09 +00:00
renovate[bot] b87c41115e
chore(deps): update dependency rubocop-rspec to v3.0.3 (#31009) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-12 12:20:32 +00:00
David Roetzel 35a437a03f
Destroy `NotificationRequest`s that are dismissed (#31008) 2024-07-12 12:09:52 +00:00
Claire 8d2a93b0cb [Glitch] Add setting to disable hover cards 
Port ad52b04a1c to glitch-soc

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2024-07-12 13:50:42 +02:00
Claire 55cf5e0188 Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream 2024-07-12 13:41:54 +02:00
renovate[bot] c929b4cace
chore(deps): update dependency pghero to v3.6.0 (#30994) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-12 09:29:43 +00:00
renovate[bot] 9cc0607358
chore(deps): update dependency database_cleaner-active_record to v2.2.0 (#31007) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-12 09:29:10 +00:00
Matt Jankowski 43e24dbb13
Use `include_pagination_headers` in more places (#30999) 2024-07-12 08:30:52 +00:00
github-actions[bot] 28ad3588e4
New Crowdin Translations (automated) (#31006) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-12 08:25:27 +00:00
renovate[bot] fdad4dc918
fix(deps): update babel monorepo to v7.24.8 (#31002) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-12 08:23:04 +00:00
Nick Schonning cd1bc94cd2
Regen RuboCop TODO for 1.65.0 (#31003) 2024-07-12 08:22:31 +00:00
Matt Jankowski 73d53827ea
Add change assertion to invites destroy spec (#31004) 2024-07-12 08:19:15 +00:00
renovate[bot] bb702e6b20
fix(deps): update dependency sass to v1.77.8 (#31005) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-12 08:18:35 +00:00
Claire 813f86d6ff
Merge pull request #2774 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 8c8bee5a36
 2024-07-11 22:57:59 +02:00
Claire ad52b04a1c
Add setting to disable hover cards (#30931) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2024-07-11 19:42:58 +00:00
Renaud Chaput e26052192d [Glitch] Change disabled buttons color in light mode to make it more visible 
Port 8c8bee5a36 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-11 21:08:20 +02:00
Claire db0b12e5dc Merge commit '8c8bee5a36e0cd0b5d35903f8891896447c3e060' into glitch-soc/merge-upstream 2024-07-11 21:07:03 +02:00
Renaud Chaput 8c8bee5a36
Change disabled buttons color in light mode to make it more visible (#30998) 2024-07-11 13:43:42 +00:00
Matt Jankowski 6c37529723
Use `module: :auth` to wrap `devise_for` routes config (#30990) 2024-07-11 11:13:55 +00:00
github-actions[bot] c244b70dc2
New Crowdin Translations (automated) (#30993) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-11 10:38:35 +00:00
renovate[bot] 24bdba3413
chore(deps): update dependency rubocop to v1.65.0 (#30985) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-11 10:30:55 +00:00
renovate[bot] 631a5eec85
chore(deps): update dependency charlock_holmes to v0.7.9 (#30992) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-10 19:59:34 +00:00
github-actions[bot] 182fee1c45
New Crowdin Translations (automated) (#2738) 
* New Crowdin translations

* Fix bogus no.yml

* Fix bogus simple_form.no.yml

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-10 18:18:15 +02:00
Claire 5c9c02417a
Merge pull request #2772 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 2ea9336b68
 2024-07-10 18:11:50 +02:00
Emelia Smith d436696f46
Streaming: Fix incorrect type definitions (#30977) 2024-07-10 15:59:18 +00:00
Claire 959ad1d6be Fix deprecation warning in win95 theme 2024-07-10 17:46:33 +02:00
Renaud Chaput 0d4a8a53d5 [Glitch] Fix SCSS mixed declarations deprecation 
Port 182b9248c0 to glitch-soc
 2024-07-10 16:59:31 +02:00
Claire 52fb4f16ef Merge commit '2ea9336b6855b44126a55106a81e96ea68eaf8ff' into glitch-soc/merge-upstream 2024-07-10 16:58:06 +02:00
David Roetzel 2ea9336b68
Do not pass unknown encoding names to nokogiri. (#30987) 2024-07-10 14:25:39 +00:00
Renaud Chaput 36592d10aa
Change Sidekiq readiness file to use an environment variable (#30988) 2024-07-10 12:57:25 +00:00
Renaud Chaput 182b9248c0
Fix SCSS mixed declarations deprecation (#30986) 2024-07-10 12:23:24 +00:00
github-actions[bot] 9984fca9a0
New Crowdin Translations (automated) (#30983) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-10 10:40:19 +00:00
renovate[bot] 8dea897a3b
chore(deps): update docker.io/ruby docker tag to v3.3.4 (#30980) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-10 10:04:52 +00:00
renovate[bot] d0137910c6
chore(deps): update dependency ruby to v3.3.4 (#30969) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-10 10:04:11 +00:00
renovate[bot] c9f08f77ed
fix(deps): update dependency sass to v1.77.7 (#30981) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-10 06:55:26 +00:00
Claire 56e347d149
Merge pull request #2771 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 967505ee9b
 2024-07-09 23:20:17 +02:00
Claire 388672ff0d Merge commit '967505ee9bcacf0e5189aa06c654ff586c198a46' into glitch-soc/merge-upstream 2024-07-09 20:39:09 +02:00
David Roetzel 967505ee9b
Add size limit for all PreviewCard URLs (#30973) 2024-07-09 13:11:34 +00:00