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

18437 Commits (db11493851b3da96d23e85fc66f6c4172c92008a)

Author SHA1 Message Date
Claire b7af3115a7 Merge commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a constraint on a setting textually close
  to glitch-soc-only settings.
  Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for the `translate` attribute on a few elements,
  where glitch-soc had a different set of allowed elements and attributes.
  Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored to use RSpec's `instance_double` instead of `double`,
  but glitch-soc had changes to tests due to configurable max toot chars.
  Applied upstream's changes while keeping tests against configurable max
  toot chars.
 2023-06-25 14:27:38 +02:00
Claire 3d50947e62 Fix verified badge in account lists potentially including rel="me" links (#25561) 2023-06-24 17:24:31 +02:00
Eugen Rochko 1caf3a3933 Change labels and styles on the onboarding screen in web UI (#25559) 2023-06-23 16:34:27 +02:00
Claire 7acdf21c77 Remove unique accounts condition from Home onboarding prompt (#25556) 2023-06-23 14:44:54 +02:00
Eugen Rochko ad92c48d71 Add onboarding prompt when home feed too slow in web UI (#25267) 2023-06-22 23:48:40 +02:00
Claire 3406cb0427 Add POST /api/v1/conversations/:id/unread (#25509) 2023-06-22 18:46:43 +02:00
Matt Jankowski acc8d8bf8e Use default `bootsnap/setup` in boot.rb (#25502) 2023-06-22 18:46:32 +02:00
Claire 9a27d4ec36 Fix j/k keyboard shortcuts on some status lists (#25554) 2023-06-22 17:54:43 +02:00
Claire d0144d2be3 Change /api/v1/statuses/:id/history to always return at least one item (#25510) 2023-06-22 14:56:14 +02:00
Matt Jankowski 011006c01b Fix `RSpec/VerifiedDoubles` cop (#25469) 2023-06-22 14:55:22 +02:00
Matt Jankowski a62df37800 Reduce `Admin::Reports::Actions` spec db activity (#25465) 2023-06-22 14:53:13 +02:00
Claire c1c87fe7b9 Add finer permission requirements for managing webhooks (#25463) 2023-06-22 14:52:25 +02:00
Matt Jankowski bb928d2f12 Speed-up on `StatusesController` spec (#25549) 2023-06-22 14:51:53 +02:00
mogaminsk e87a2c676c Fix custom signup URL may not loaded (#25531) 2023-06-22 12:10:49 +02:00
Matt Jankowski 397f0cd5e3 Speed-up on `BackupService` spec (#25527) 2023-06-22 11:53:28 +02:00
Daniel M Brasil 33f3a9c5f5 Migrate to request specs in `/api/v1/suggestions` (#25540) 2023-06-22 11:49:35 +02:00
Ian a56475866f Change emoji picker icon (#25479) 2023-06-21 17:58:00 +02:00
Claire 4e0718dbf5 Add per-test timeouts to AutoStatusesCleanupScheduler tests (#24841) 2023-06-20 18:54:05 +02:00
Claire 5e5af7a0fe Fix /api/v1/conversations sometimes returning empty accounts (#25499) 2023-06-20 18:32:26 +02:00
Claire ba5c12974a Fix missing validation on `default_privacy` setting (#25513) 2023-06-20 18:32:14 +02:00
Daniel M Brasil 88cdb02d89 Migrate to request specs in `/api/v1/admin/account_actions` (#25514) 2023-06-20 18:16:48 +02:00
Claire 923dde8e6c Fix wrong view being displayed when a webhook fails validation (#25464) 2023-06-20 18:15:35 +02:00
Claire 4e861795a4 Add translate="no" to outgoing mentions and links (#25524) 2023-06-20 18:10:19 +02:00
Emelia Smith 71d3100038 Prevent UserCleanupScheduler from overwhelming streaming (#25519) 2023-06-20 18:04:35 +02:00
Plastikmensch 02ff7c5f3d Re-allow title attribute in <abbr> (#2254) 
* Re-allow title attribute in <abbr>

This was accidentally removed in a6363c3a2a

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Add test

Add a new test to check that title attribute on <abbr> is kept.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

---------

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-06-19 18:01:35 +02:00
Claire ecf17008e8 Fix user settings not getting validated (#25508) 2023-06-19 14:06:06 +01:00
たいち ひ 6c4a6bd115 Rewrite `<AutosuggestHashtag />` as FC and TS (#25481) 2023-06-19 14:11:46 +02:00
Matt Jankowski d05a68a12e Reduce `sleep` time in request pool spec (#25470) 2023-06-19 13:48:25 +02:00
renovate[bot] 4564d41358 Update dependency dotenv to v16.2.0 (#25506) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-19 11:28:59 +02:00
Matt Jankowski ed134709aa Add coverage for `UserMailer` methods (#25484) 2023-06-19 09:50:35 +02:00
Matt Jankowski 72542ce967 Combine assertions in api/v1/notifications spec (#25486) 2023-06-19 09:05:42 +02:00
Matt Jankowski eb10ac2b3e Remove unused `picture_hint` helper method (#25485) 2023-06-19 09:04:15 +02:00
renovate[bot] c547b262ab Update dependency aws-sdk-s3 to v1.126.0 (#25480) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-19 09:03:50 +02:00
Daniel M Brasil 498e3231b6 Fix incorrect pagination headers in `/api/v2/admin/accounts` (#25477) 2023-06-19 08:53:05 +02:00
Daniel M Brasil a27a33ebde Migrate to request specs in `/api/v1/tags` (#25439) 2023-06-19 08:51:40 +02:00
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