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

17506 Commits (5acbecc213a862eab61e08996f4dc9873d519816)

Author SHA1 Message Date
Claire 5acbecc213 Merge pull request #2161 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-04-04 13:17:45 +02:00
Rubicon Rowe f49d2ec5a3 [Glitch] Fix inconsistent radius in drawer 
Port ffa9249c1e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-04 12:51:24 +02:00
Claire 8364f82281 Merge branch 'main' into glitch-soc/merge-upstream 2023-04-04 12:45:12 +02:00
Claire 6ccd12b521 Fix unescaped user input in LDAP query (#24379) 2023-04-04 12:42:38 +02:00
Claire 97e8fe9eae Merge pull request #2159 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-04-04 12:01:52 +02:00
Rubicon Rowe ffa9249c1e Fix inconsistent radius in drawer (#24407) 2023-04-04 11:41:05 +02:00
dependabot[bot] effdd4d6af Bump glob from 9.3.2 to 9.3.4 (#24383) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-04 11:25:25 +02:00
dependabot[bot] d88a8f0de5 Bump devise from 4.9.0 to 4.9.2 (#24393) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-04 11:09:34 +02:00
dependabot[bot] 4ccbcc3466 Bump doorkeeper from 5.6.5 to 5.6.6 (#24399) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-04 11:04:56 +02:00
dependabot[bot] a597bc88ca Bump tzinfo-data from 1.2023.2 to 1.2023.3 (#24400) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-04 11:02:33 +02:00
Nick Schonning 72a1dd736a Align typings with installed versions (#24410) 2023-04-04 10:48:26 +02:00
Christian Schmidt 90ecb96dba [Glitch] Add colour to follow button when hashtag is being followed 
Port d5da587d27 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-03 18:07:34 +02:00
Claire 5fbae7cb2a Merge branch 'main' into glitch-soc/merge-upstream 2023-04-03 17:40:59 +02:00
Claire 6f60f2e2b8 Merge pull request #2155 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-04-03 17:21:33 +02:00
Christian Schmidt d5da587d27 Add colour to follow button when hashtag is being followed (#24361) 2023-04-03 16:25:15 +02:00
dependabot[bot] 5ff9f89c05 Bump uri from 0.12.0 to 0.12.1 (#24341) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-03 16:22:55 +02:00
Claire d586a37618 Clean up JS dependencies (#24377) 2023-04-03 15:06:29 +02:00
Claire e03f9b38c5 Change root Chewy strategy to emit a warning instead of erroring out in production mode (#24327) 2023-04-03 15:05:39 +02:00
Eugen Rochko 1c1bbbebd6 New Crowdin updates (#24276) 
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2023-04-03 14:44:43 +02:00
Nick Schonning d0bf149232 Move ESLint configs to overrides (#24370) 2023-04-03 12:41:10 +02:00
Renaud Chaput eb171b7ce4 Fix build issues caused by #16210 (#24374) 2023-04-03 12:31:34 +02:00
fusagiko / takayamaki 4866812b28 [Proposal] Make able to write React in Typescript (#16210) 
Co-authored-by: berlysia <berlysia@gmail.com>
Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com>
 2023-04-03 03:31:39 +02:00
Alison Wheeler 218e88df65 Update redis_config.rb to remove warning message (#24352) 2023-04-02 06:49:37 +02:00
Claire b12fcd3d7a Merge branch 'main' into glitch-soc/merge-upstream 2023-04-01 14:31:05 +02:00
Eugen Rochko d22e712648 Change search pop-out in web UI (#24305) 2023-04-01 09:59:10 +02:00
Eugen Rochko 4e63f1e64b Fix regressions from change in account row design in web UI (#24343) 2023-04-01 09:27:23 +02:00
Vyr Cossont 15f9f8962e Fix Redis client and type errors introduced in #24285 (#24342) 2023-04-01 08:28:35 +02:00
Tdxdxoz f9cc42d6db [Glitch] Fix: set multiColumn value for /explore Statuses 
Port d339684df5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-03-31 22:50:57 +02:00
Nick Schonning bba0493afe [Glitch] Move marky to devDependency 
Port a159e8e5e1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-03-31 22:50:57 +02:00
Claire 5e6da39214 Restore exif-js dependency 2023-03-31 22:50:57 +02:00
Claire bb5b3182f0 Migrate glitch-soc's exclusive user settings 2023-03-31 22:50:57 +02:00
Claire db2b09bdd4 Fix invalid/expired invites being processed on sign-up (#24337) 2023-03-31 21:42:28 +02:00
Claire 1a0c54554f Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream added a link to the roadmap, but we have a completely different README.
  Kept ours.
- `app/models/media_attachment.rb`:
  Upstream upped media attachment limits.
  Updated the default according to upstream's.
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream changed the migration compatibility level.
  Did so too.
- `config/initializers/content_security_policy.rb`:
  Upstream refactored this file but we have a different version.
  Kept our version.
- `app/controllers/settings/preferences_controller.rb`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  The file does not directly references individual settings anymore.
  Applied upstream changes.
- `app/lib/user_settings_decorator.rb`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  The file got removed entirely.
  Removed it as well.
- `app/models/user.rb`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  References to individual settings have been removed from the file.
  Removed them as well.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/notifications/show.html.haml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  Applied upstream's changes and ported ours back.
- `config/settings.yml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  In particular, upstream removed user-specific and unused settings.
  Did the same in glitch-soc.
- `spec/controllers/application_controller_spec.rb`:
  Conflicts due to glitch-soc's theming system.
  Mostly kept our version, as upstream messed up the tests.
 2023-03-31 21:30:27 +02:00
Nick Schonning f7bc9e2fcd Add Roadmap to README (#24288) 2023-03-31 19:20:11 +02:00
Sai fbe173fe35 Bump ruby to 3.2.2 due to ReDoS vulnerabilities (#24320) 2023-03-31 18:28:40 +02:00
Nick Schonning e400e6d2bb Add documentation for Rubocop overrides (#23811) 2023-03-31 16:08:53 +02:00
Nick Schonning 5f1a0f550b Autofix Rubocop Rails/IgnoredColumnsAssignment (#23761) 2023-03-31 15:07:22 +02:00
Vyr Cossont 3cf19b953f IndexingScheduler: fetch and import in batches (#24285) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-03-31 14:38:47 +02:00
Nick Schonning 2a0d2453b0 Autofix Rubocop Style/IdenticalConditionalBranches (#24322) 2023-03-31 09:33:52 +02:00
Nick Schonning 718cdb0286 Enable Rubocop Metrics/BlockLength with Excludes (#24260) 2023-03-31 09:33:25 +02:00
Christian Schmidt 41190c8172 Wrong type for user setting when default is defined by lambda (#24321) 2023-03-31 07:33:17 +02:00
Eugen Rochko 868d478b1b Change "direct message" nomenclature to "private mention" in web UI (#24248) 2023-03-30 15:16:20 +02:00
Eugen Rochko c75fccf033 Change user settings to be stored in a more optimal way (#23630) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-03-30 14:44:00 +02:00
Claire 13fb0cc4f0 Fix stale apt index in github actions (#24319) 2023-03-30 14:19:33 +02:00
dependabot[bot] eb8d0e0dfc Bump cssnano from 5.1.15 to 6.0.0 (#24296) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-30 10:38:00 +02:00
Tdxdxoz d339684df5 Fix: set multiColumn value for /explore Statuses (#24314) 2023-03-30 10:14:49 +02:00
mogamin a9715ecd73 Fix missing translation in pagination gap tags (#24262) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2023-03-29 13:54:33 +02:00
Robert R George f8c5b58f94 Fixes launching of the devcontainer and adds support for Docker Desktop (#24303) 2023-03-29 13:27:19 +02:00
dependabot[bot] 0771672b23 Bump sass from 1.59.3 to 1.60.0 (#24292) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-29 11:27:14 +02:00
dependabot[bot] d865ecc9a3 Bump rimraf from 4.4.0 to 4.4.1 (#24291) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-29 11:11:50 +02:00