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

17253 Commits (1103612c663b441aa1d51409e11368f987c006d6)

Author SHA1 Message Date
Claire 1103612c66 Merge pull request #2121 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-03-05 20:37:42 +01:00
Christian Schmidt b50a08b15b [Glitch] Add `lang` attribute to media and poll options 
Port 41655e16ea to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-03-05 17:52:53 +01:00
Claire a95dc48e01 Merge branch 'main' into glitch-soc/merge-upstream 2023-03-02 17:32:38 +01:00
Matt Jankowski 35cbd0685d Fix deprecation warning about merging conditions (#23618) 2023-03-02 16:21:04 +01:00
Matt Jankowski 0d409f9fd7 Update rspec-rails to version 6.0.1 (#23908) 2023-03-02 15:55:37 +01:00
Matt Jankowski 0fe721074b Add spec coverage for Admin::Trends::StatusesHelper (#23898) 2023-03-02 15:30:40 +01:00
Shlee aadfaf38a8 [Dependashlee] Bump @github/webauthn-json from 0.5.7 to 2.1.1 (js) (#23819) 2023-03-02 11:45:14 +01:00
Shlee a54a2c4af7 [Dependashlee] Bump fuzzysort from 1.9.0 to 2.0.4 (JS) (#23822) 2023-03-02 11:41:32 +01:00
Shlee a2087edbf4 [Dependashlee] Bump color-blend from 3.0.1 to 4.0.0 (JS) (#23823) 2023-03-02 11:08:22 +01:00
Stanislav Dobrovolschii eaea285368 Add rspecs for FollowRecommendationsScheduler (#23890) 2023-03-02 10:05:05 +01:00
Matt Jankowski 5bf8f34842 Spec coverage for HomeHelper (#23907) 2023-03-02 10:04:14 +01:00
Eugen Rochko 096f622340 New Crowdin updates (#23802) 
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2023-02-28 23:01:05 +09:00
Nick Schonning 19be243493 Autofix Rubocop Style/HashConversion (#23852) 2023-02-28 22:59:19 +09:00
Matt Jankowski 04082726de Admin mailer spec coverage improvement (#23863) 2023-02-28 22:33:34 +09:00
Shlee 8ed5fc7252 [Dependashlee] Update to Puma 6.1.0 (#23795) 2023-02-28 13:30:28 +01:00
Matt Jankowski 9cf4671ba1 Remove unused admin/announcements helper (#23899) 2023-02-28 11:56:50 +01:00
Matt Jankowski 1d248c3f57 Remove unused InstancePresenter#sample_accounts method (#23900) 2023-02-27 19:03:35 +01:00
Matt Jankowski 7e7fa6cb40 Add policies and serializers groups to simplecov output (#23897) 2023-02-27 16:35:47 +01:00
Matt Jankowski 385ae6681d Fix single-record invalid condition on PollVote (#23810) 2023-02-27 09:31:15 +01:00
Christian Schmidt 41655e16ea Add `lang` attribute to media and poll options (#23891) 2023-02-26 20:13:27 +01:00
Claire 8d645954fa Merge pull request #2119 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-02-26 15:06:03 +01:00
Claire 42f73a411c Move misc rules from components/index.scss to components/misc.scss 2023-02-25 23:47:21 +01:00
Claire 59b7c6e3d8 Fix glitch-soc SCSS code style and refactor closer to upstream 2023-02-25 23:46:23 +01:00
Claire 2e98a75c36 Add glitch-soc's win95.scss and reset.scss to stylelint's ingore list 2023-02-25 23:45:30 +01:00
Christian Schmidt 5eaad2ae5b [Glitch] Add `lang` attribute to preview card 
Port e56145661c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-02-25 14:43:57 +01:00
Tim Lucas 650ea1316a [Glitch] Increase contrast of upload progress background 
Port 808c9a7cf4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-02-25 14:43:24 +01:00
Botao Wang 213b82d0a4 [Glitch] Fix sidebar cut-off on small screens in admin UI 
Port 1f844d0d18 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-02-25 14:40:29 +01:00
Claire 5548b2c73f [Glitch] Add `lang` tag to native language names in language picker 
Port 82c464d4d0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-02-25 14:37:05 +01:00
Renaud Chaput 295d193e7f [Glitch] Rename JSX files with proper `.jsx` extension 
Port ae3812d182 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-02-25 14:35:31 +01:00
Claire f3cd30942c Fix building vanilla flavor after JSX change 2023-02-25 14:28:59 +01:00
Claire f15ded319f Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.prettierignore`:
  Upstream added a line at the end of the file, while glitch-soc had its own
  extra lines.
  Took upstream's change.
- `CONTRIBUTING.md`:
  We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
  Ported upstream changes.
- `app/controllers/application_controller.rb`:
  Upstream made code style changes in a method that is entirely replaced
  in glitch-soc.
  Ignored the change.
- `app/models/account.rb`:
  Code style changes textually close to glitch-soc-specific changes.
  Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream code style changes.
  Ignored them.
 2023-02-25 14:00:40 +01:00
Matt Jankowski c759d6f31d Remove unused HTML Validator (#23866) 2023-02-24 20:06:32 +01:00
Christian Schmidt e56145661c Add `lang` attribute to preview card (#23869) 2023-02-24 20:04:38 +01:00
Nick Schonning 1cdd7d6c8f Rename ActivityPub Serializer Specs (#23844) 2023-02-23 23:17:48 +01:00
Claire bc4837a600 Change auto-deletion throttling constants to better scale with server size (#23320) 2023-02-23 16:52:40 +01:00
Tim Lucas 808c9a7cf4 Increase contrast of upload progress background (#23836) 2023-02-23 12:58:42 +01:00
Nick Schonning 43a3812265 Fix mispelled spec filenames (#23834) 2023-02-23 11:28:56 +01:00
Eugen Rochko 6bfb54dccc New Crowdin updates (#23625) 
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2023-02-22 21:16:02 +09:00
Claire 0fb32f919f Fix inefficiency when searching accounts per username in admin interface (#23801) 2023-02-22 11:53:13 +01:00
Claire 3423976bda Fix rack:attack flaky tests and test end of throttle period (#23799) 2023-02-22 10:28:52 +01:00
Nick Schonning 4f6ad6475e Autofix Rubocop Rails/Blank (#23765) 2023-02-22 09:57:56 +09:00
Nick Schonning eb6991cee1 Autofix Rubocop Rails/RootPathnameMethods (#23760) 2023-02-22 09:57:15 +09:00
Nick Schonning 3e43bc352d Ignore JSX files from Prettier (#23777) 2023-02-22 09:56:11 +09:00
Nick Schonning dd46810e8a Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
Nick Schonning 247bf6e812 Enable Rubocop Style/StringConcatenation defaults (#23792) 2023-02-22 09:54:36 +09:00
dependabot[bot] f5f5144098 Bump @babel/plugin-proposal-decorators from 7.20.13 to 7.21.0 (#23769) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-02-21 11:35:27 +01:00
dependabot[bot] 3ba636994b Bump @babel/plugin-transform-react-inline-elements from 7.18.6 to 7.21.0 (#23766) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-02-21 11:14:25 +01:00
dependabot[bot] e504d9acd2 Bump @babel/plugin-transform-runtime from 7.19.6 to 7.21.0 (#23774) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-02-21 10:59:58 +01:00
dependabot[bot] 78149d75ed Bump @babel/core from 7.20.12 to 7.21.0 (#23767) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-02-21 10:46:03 +01:00
dependabot[bot] ee1b61708d Bump @babel/runtime from 7.20.13 to 7.21.0 (#23773) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-02-21 10:44:51 +01:00