treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
18,557 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

18557 Commits (93d9e16cfc3e99f0ba7669ffed64fb47268ec3a4)

Author SHA1 Message Date
Claire 58b0a61705 Merge pull request #2252 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-06-18 16:38:08 +02:00
Claire 4e889e478f Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/application.html.haml`:
  Conflicts due to glitch-soc's theming system.
  Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
- `app/views/layouts/embedded.html.haml`:
  Conflicts due to glitch-soc's theming system.
  Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
 2023-06-18 16:14:29 +02:00
Claire 02cf742aea Merge pull request #2251 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-06-18 16:11:49 +02:00
Claire 85f74ed0a7 Fix cross-origin loading of locales (#25498) 2023-06-18 15:47:04 +02:00
Claire d5a295f8c0 [Glitch] Fix non-interactive upload container being given a `button` role and tabIndex 
Port 7c70237d7e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 14:10:49 +02:00
Claire 05adb637b7 Fix glitch-soc-only test being broken by refactor of the surrounding tests 2023-06-18 13:59:47 +02:00
Claire 7066e3d5ce Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/profiles/show.html.haml`:
  Upstream redesigned the settings page, where glitch-soc had changes because of
  the ability to set some custom limits.
  Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
  Upstream updated dependencies textually close to a glitch-soc-only dependency.
  Updated the dependnencies as well.
 2023-06-18 13:41:33 +02:00
Eugen Rochko 85041b74fb [Glitch] Fix CAPTCHA page not following design pattern of sign-up flow 
Port 239ee4f5d1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 12:11:58 +02:00
たいち ひ 5a38d538a0 [Glitch] Rewrite `emoji_mart_data_light` as TS 
Port 6e0c48cbe8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 12:11:19 +02:00
alfe 7e24689b7d [Glitch] Rewrite `<LoadingIndicator/>` as FC and TS (#25364) 
Port 293cf44626 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 12:10:37 +02:00
Renaud Chaput 0e43f4d4fc [Glitch] Add missing report category translation 
Port b51a10a066 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 10:43:07 +02:00
alfe 8cbdffe2c7 [Glitch] Rewrite <LoadPending /> as FC and TS 
Port 569ff79fb8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 10:42:04 +02:00
Eugen Rochko 1ce44ec36e [Glitch] Change "bot" label to "automated" 
Port 272e099bce to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 10:40:56 +02:00
Claire f101b67a45 Merge commit '239ee4f5d10aaa30b52cc59a58b2dc33fea5615f' into glitch-soc/merge-upstream 2023-06-18 10:36:14 +02:00
renovate[bot] 2d058a8499 Update dependency aws-sdk-s3 to v1.125.0 (#25458) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-16 14:23:58 +02:00
Claire 7c70237d7e Fix non-interactive upload container being given a `button` role and tabIndex (#25462) 2023-06-16 12:03:06 +02:00
Matt Jankowski 2bd353cdf5 Remove Ruby GC config from spec helper (#25455) 2023-06-15 22:14:46 +01:00
renovate[bot] a5beca28d5 Update dependency better_errors to v2.10.1 (#25445) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-15 10:41:04 +02:00
Daniel M Brasil dc9352a450 Migrate to request specs in `/api/v1/lists` (#25443) 2023-06-15 10:19:51 +02:00
renovate[bot] 1dc2b1459d Lock file maintenance (#25434) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-15 10:13:12 +02:00
renovate[bot] f370bdc45e Update dependency intl-messageformat to v10.5.0 (#25431) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-15 09:36:10 +02:00
renovate[bot] 37326f3117 Update dependency core-js to v3.31.0 (#25430) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-14 18:32:55 +02:00
renovate[bot] 5693fd16a1 Update libretranslate/libretranslate Docker tag to v1.3.11 (#25428) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-14 18:15:32 +02:00
renovate[bot] 2f57cdadcf Update devDependencies (non-major) (#25427) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-14 18:12:33 +02:00
Matt Jankowski eb1f69c2d4 Update rubocop-rspec to version 2.22.0, fix `RSpec/IndexedLet` cop (#24698) 2023-06-14 16:44:37 +02:00
Daniel M Brasil 507a7e785a Migrate to request specs in `/api/v1/domain_blocks` (#25414) 2023-06-14 16:08:53 +02:00
Daniel M Brasil 895e157b4d Migrate to request specs in `/api/v1/follow_requests` (#25411) 2023-06-14 15:43:50 +02:00
Daniel M Brasil 4a994e5b50 Fix `ArgumentError` in `/api/v1/admin/accounts/:id/action` (#25386) 2023-06-14 15:21:36 +02:00
renovate[bot] dc31ba1a28 Update dependency sass to v1.63.3 (#25422) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-14 11:23:54 +02:00
renovate[bot] 0d6ef9b21b Update dependency redis-namespace to v1.11.0 (#25421) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-14 11:18:37 +02:00
renovate[bot] 4ceaee0da5 Update formatjs monorepo (#25418) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-14 11:16:36 +02:00
renovate[bot] 2d07bde935 Update dependency glob to v10.2.7 (#25417) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-14 10:56:22 +02:00
Matt Jankowski b47741bb29 Reduce factory data created in spec/models/trends/statuses spec (#25410) 2023-06-14 09:57:06 +02:00
Matt Jankowski 8c7da82c64 Speed improvement for `AccountsStatusesCleanupScheduler` spec (#25406) 2023-06-14 09:56:11 +02:00
Daniel M Brasil 943c99f780 Migrate to request specs in `/api/v1/apps/verify_credentials` (#25404) 2023-06-14 09:48:57 +02:00
Daniel M Brasil 51fdaefad4 Migrate to request specs in `/api/v1/apps` (#25401) 2023-06-14 09:48:48 +02:00
Matt Jankowski bc7346ab9c Extract shared examples from api specs (#25387) 2023-06-14 09:34:01 +02:00
renovate[bot] d8ef35d088 Update babel monorepo to v7.22.5 (#25405) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2023-06-14 09:22:54 +02:00
renovate[bot] 8fd0c8ba3b Update dependency capybara to v3.39.2 (#25407) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-14 09:21:30 +02:00
renovate[bot] 991d7e326f Update dependency aws-sdk-s3 to v1.124.0 (#25297) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-14 09:05:30 +02:00
Eugen Rochko 937764ce4b Fix always redirecting to onboarding in web UI (#25396) 2023-06-14 09:05:03 +02:00
Claire a424076226 Fix ArgumentError when loading newer Private Mentions (#25399) 2023-06-14 08:54:52 +02:00
Eugen Rochko 989a8758e3 Change edit profile page (#25413) 2023-06-14 04:38:07 +02:00
Eugen Rochko 239ee4f5d1 Fix CAPTCHA page not following design pattern of sign-up flow (#25395) 2023-06-13 22:30:40 +02:00
たいち ひ 6e0c48cbe8 Rewrite `emoji_mart_data_light` as TS (#25138) 2023-06-13 19:28:31 +02:00
alfe 293cf44626 Rewrite `<LoadingIndicator/>` as FC and TS (#25364) 2023-06-13 19:26:25 +02:00
Nick Schonning 5596945b75 Update Rubocop 1.52.1 (#25376) 2023-06-13 18:42:51 +02:00
Renaud Chaput b51a10a066 Add missing report category translation (#25400) 2023-06-13 15:05:40 +02:00
Matt Jankowski 6273d4f5ee Remove unused shared examples for scoped settings (#25389) 2023-06-13 14:59:04 +02:00
Matt Jankowski 3fa5d7092e Enable paperclip for account attachment examples (#25381) 2023-06-12 17:37:43 +02:00