15325 Commits (15b5830e89614c342d2be0a83f7e4ed580baf109)
 

Author SHA1 Message Date
Claire 15b5830e89 Merge pull request #1772 from ClearlyClaire/glitch-soc/merge-upstream
3 years ago
Claire fbfa953ad2 Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Levi Bard b8319d0578 Allow import/export of instance-level domain blocks/allows (#1754)
3 years ago
Yamagishi Kazutoshi 69774b86bf Fix `Mastodon::RaceConditionError` that occurs when external status is reblogged (#18424)
3 years ago
Claire e6af69d56b Use upstream's settings for CW auto-expand and column swiping (#1770)
3 years ago
Eugen Rochko f806b5d6b6 New Crowdin updates (#18339)
3 years ago
James Smith d0be8f6c99 Support STREAMING_API_BASE_URL in Helm Chart (#18408)
3 years ago
Eugen Rochko 764904edf3 Fix missing string for appeal validation error (#18410)
3 years ago
Claire 205f6b815c Fix setting for trending tags and trending links notifications being swapped (#1771)
3 years ago
Eugen Rochko f1707c6d50 Refactor how Redis locks are created (#18400)
3 years ago
Jeong Arm 394dacef21 Fix rss view on hashtag (#18406)
3 years ago
dependabot[bot] ef5cb713ea Bump rails from 6.1.5.1 to 6.1.6 (#18372)
3 years ago
dependabot[bot] 521991dd2e Bump @rails/ujs from 6.1.5 to 6.1.6 (#18380)
3 years ago
dependabot[bot] f5ac7ae316 Bump nokogiri from 1.13.4 to 1.13.6 (#18371)
3 years ago
dependabot[bot] 9a91bf86e9 Bump aws-sdk-s3 from 1.113.2 to 1.114.0 (#18373)
3 years ago
Claire a68673983f Merge pull request #1767 from ClearlyClaire/glitch-soc/merge-upstream
3 years ago
Eugen Rochko fbef44009d [Glitch] Add `limited` attribute to accounts in REST API and a warning in web UI
3 years ago
Eugen Rochko 6256a3da46 [Glitch] Remove Keybase integration
3 years ago
Claire 6545114ac7 [Glitch] Fix block/mute lists showing a follow button when unblocking a user (#18364)
3 years ago
Claire c6e7c928ab Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
dependabot[bot] 1d596da25c Bump jest from 28.0.3 to 28.1.0 (#18377)
3 years ago
dependabot[bot] 2b7bdfa482 Bump sidekiq-unique-jobs from 7.1.21 to 7.1.22 (#18375)
3 years ago
dependabot[bot] 1a6ac50f31 Bump array-includes from 3.1.4 to 3.1.5 (#18381)
3 years ago
dependabot[bot] 1dbf9ed655 Bump i18n-tasks from 1.0.9 to 1.0.10 (#18370)
3 years ago
dependabot[bot] cc9d618428 Bump babel-jest from 28.0.3 to 28.1.0 (#18374)
3 years ago
dependabot[bot] 85d0e1b31d Bump jest-environment-jsdom from 28.0.2 to 28.1.0 (#18379)
3 years ago
dependabot[bot] 5bedcdbe87 Bump capybara from 3.36.0 to 3.37.1 (#18376)
3 years ago
dependabot[bot] 385f6e1f39 Bump react-select from 5.3.1 to 5.3.2 (#18382)
3 years ago
Eugen Rochko ac3d6f9a35 Add `limited` attribute to accounts in REST API and a warning in web UI (#18344)
3 years ago
luzpaz 3e20855c52 Fix typo in source `setted`->`set` (#18385)
3 years ago
Claire 917567567a Fix block/mute lists showing a follow button when unblocking a user (#18364)
3 years ago
Claire 5cc4d2ed8b Fix redis configuration not being changed by mastodon:setup (#18383)
3 years ago
Eugen Rochko 41ad817afa Change RSS feeds (#18356)
3 years ago
Claire 7d8db91c32 Merge pull request #1766 from ClearlyClaire/glitch-soc/merge-upstream
3 years ago
Claire 3d8cef439b [Glitch] Fix streaming notifications not using quick filter logic
3 years ago
Claire c8edaaba1b [Glitch] Fix floating action button obscuring last element
3 years ago
Claire 6f69b831d6 Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Jeong Arm 8100e09fcb Update Korean translation (#1765)
3 years ago
Claire 7919b6631e Fix streaming notifications not using quick filter logic (#18316)
3 years ago
Claire 345dc4d102 Fix ambiguous wording on appeal actions (#18328)
3 years ago
Claire 82dcdc12f1 Fix floating action button obscuring last element (#18332)
3 years ago
Claire 0e0b96b8e7 Fix account warnings not being recorded in audit log (#18338)
3 years ago
Eugen Rochko 3ce9a50930 New Crowdin updates (#18255)
3 years ago
Stefano Pigozzi 02987b1191 Replace leftover `envelope` icons with `at` icons (#18305)
3 years ago
Sara Golemon 7c1bd95c9b Allow VerifyLinkService to accept backlinks with differing case (#18320)
3 years ago
Jeremy Kescher 92b53b60ae Fix incorrect upload size limit at /admin/custom_emojis/new in glitch-soc (#1763)
3 years ago
Claire 78eeefa08f Merge pull request #1762 from ClearlyClaire/glitch-soc/merge-upstream
3 years ago
Claire 221959d36a Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
dependabot[bot] cde543ac9c Bump sidekiq-scheduler from 3.2.0 to 4.0.0 (#18275)
3 years ago
dependabot[bot] 7cbbf36e47 Bump glob from 7.2.0 to 8.0.1 (#18013)
3 years ago