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

17474 Commits (1a0c54554f849cef6bd75265df56ebeb1686bb80)

Author SHA1 Message Date
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
dependabot[bot] 2e03db257a Bump react-textarea-autosize from 8.4.0 to 8.4.1 (#24293) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-29 11:03:38 +02:00
Christian Schmidt 72b4973f50 Requeue expiration notification (#24311) 2023-03-29 10:52:40 +02:00
dependabot[bot] cb96dd2a2c Bump react-select from 5.7.1 to 5.7.2 (#24294) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-29 10:37:33 +02:00
dependabot[bot] 313043a38f Bump prettier from 2.8.5 to 2.8.7 (#24295) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-29 10:35:27 +02:00
dependabot[bot] ac792ced54 Bump mkdirp from 2.1.5 to 2.1.6 (#24297) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-29 10:34:49 +02:00
dependabot[bot] 041c1c5305 Bump glob from 9.3.0 to 9.3.2 (#24298) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-29 10:34:27 +02:00
dependabot[bot] b727d96093 Bump aws-sdk-s3 from 1.119.1 to 1.119.2 (#24299) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-29 10:33:08 +02:00
dependabot[bot] c728972888 Bump tzinfo-data from 1.2022.7 to 1.2023.2 (#24300) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-29 10:32:51 +02:00
Robert R George 5e88776f9d Wrap db:setup with Chewy.strategy(:mastodon) (#24302) 2023-03-29 09:58:27 +02:00
Nick Schonning 1cec8e6335 Use Yarn instead of NPX for pre-commit hook (#24287) 2023-03-28 06:28:57 +02:00
Nick Schonning 5001a7d862 Remove remaining CodeClimate references (#24289) 2023-03-28 02:07:06 +02:00
Claire 092058da27 Add migration tests for user mail notification settings (#24277) 2023-03-27 17:54:42 +02:00
Claire af57bcd3cf Fix user archive takeout when using OpenStack Swift or S3 providers with no ACL support (#24200) 2023-03-27 17:07:37 +02:00
Nick Schonning a159e8e5e1 Move marky to devDependency (#24258) 2023-03-27 16:11:45 +02:00
Claire 3319e54632 Update strong-migrations-enabled migrations from 5.0 and 5.1 to 5.2 (#24275) 2023-03-27 16:09:10 +02:00
Eugen Rochko 5b9c983305 New Crowdin updates (#24130) 
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2023-03-27 20:01:47 +09:00
Claire 72a030c14c Merge pull request #2151 from ClearlyClaire/glitch-soc/main 
Merge upstream changes
 2023-03-27 12:49:33 +02:00
Eugen Rochko 5ec33534f8 Refactor styles to use logical properties for positioning (#23944) 2023-03-27 10:56:25 +02:00
Vyr Cossont 13db7d0075 Serialize status webhook events in REST API format (#24243) 2023-03-27 09:14:21 +02:00
Matt Jankowski 48befe5dbd Update strong_migrations to version 0.8.0 (#24270) 2023-03-27 09:11:10 +02:00
neatchee a73b29e8cc [Glitch] Remove legacy decorators syntax 
Port e272fc91e4 to glitch-soc
 2023-03-27 08:51:57 +02:00
Nick Schonning 6ff64efd07 Setup Husky and lint-stage for commit fixing (#23308) 2023-03-27 05:17:19 +02:00
Nick Schonning 57e9fc7e5a [Glitch] Remove isNaN polyfill 
Port 169b9c9b13 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-03-26 15:49:49 +02:00
Claire 6a5a699fbb Merge branch 'main' into glitch-soc/main 2023-03-26 15:47:12 +02:00
mogamin c88fc5179b Fix typo in _login_activity.html.haml (#24263) 2023-03-26 10:59:14 +02:00
Matt Jankowski 38e94af384 Reset model in migration after removing column (#24250) 2023-03-26 00:40:36 +01:00
Matt Jankowski 85e90f4b7d Move link header setting to after_action (#24251) 2023-03-26 00:40:01 +01:00
Matt Jankowski 32553ac00c Migration warning helper, and only run in production env (#24253) 2023-03-26 00:39:24 +01:00
Matt Jankowski cc5208f020 Add allow_other_host in redirects which may go outside app (#24252) 2023-03-26 00:38:32 +01:00
Matt Jankowski 4e6cf24ce9 Update retention model sql query (#24249) 2023-03-26 00:37:57 +01:00
Eugen Rochko 1d2a941bc8 Change media upload limits and remove client-side resizing (#23726) 2023-03-25 10:00:03 +01:00
Eugen Rochko f185c40714 Change design of account rows in web UI (#24247) 2023-03-25 08:46:32 +01:00