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

17364 Commits (66ed2c4288c4bfcb7033b3eaa1f9256d54018ca1)

Author SHA1 Message Date
kouhai dev 66ed2c4288 th: use {RAILS,NODE}_ENV=development when running webpack-dev-server with Foreman 2023-04-22 00:38:08 -07:00
kouhai dev 01c7d03aeb Merge remote-tracking branch 'glitch/main' 2023-04-22 00:38:08 -07:00
kouhai dev 12906c7d54 th: update models, node/Gemfile state 2023-04-22 00:38:08 -07:00
kouhai dev 351f0cf51a Merge remote-tracking branch 'glitch/main' 2023-04-22 00:38:08 -07:00
kouhai dev f6c88fb2a6 Merge remote-tracking branch 'glitch/main' 2023-04-22 00:38:08 -07:00
kouhai dev 6a0b004e7b th: consistent dividers 2023-04-22 00:38:08 -07:00
kouhai dev bae4217549 th: add deps rake tasks 2023-04-22 00:38:08 -07:00
Claire 6a4be4e966
Merge pull request #2119 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-02-26 15:06:03 +01:00
Claire b91756fd4d Move misc rules from components/index.scss to components/misc.scss 2023-02-25 23:47:21 +01:00
Claire cc94cc86ae Fix glitch-soc SCSS code style and refactor closer to upstream 2023-02-25 23:46:23 +01:00
Claire ac8512a73a Add glitch-soc's win95.scss and reset.scss to stylelint's ingore list 2023-02-25 23:45:30 +01:00
Christian Schmidt b632c5a55a [Glitch] Add `lang` attribute to preview card 
Port 8000a8f230 to glitch-soc

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

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

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

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

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-02-25 14:35:31 +01:00
Claire 859eb01aac Fix building vanilla flavor after JSX change 2023-02-25 14:28:59 +01:00
Claire 4ed09276d5 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 730bb3e211
Remove unused HTML Validator (#23866) 2023-02-24 20:06:32 +01:00
Christian Schmidt 8000a8f230
Add `lang` attribute to preview card (#23869) 2023-02-24 20:04:38 +01:00
Nick Schonning 19614ba247
Rename ActivityPub Serializer Specs (#23844) 2023-02-23 23:17:48 +01:00
Claire 20b80c62ff
Change auto-deletion throttling constants to better scale with server size (#23320) 2023-02-23 16:52:40 +01:00
Tim Lucas f4f91bc295
Increase contrast of upload progress background (#23836) 2023-02-23 12:58:42 +01:00
Nick Schonning 6bd7003799
Fix mispelled spec filenames (#23834) 2023-02-23 11:28:56 +01:00
Eugen Rochko 2564117131
New Crowdin updates (#23625) 
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2023-02-22 21:16:02 +09:00
Claire f682478de8
Fix inefficiency when searching accounts per username in admin interface (#23801) 2023-02-22 11:53:13 +01:00
Claire 3ed1b9ebb6
Fix rack:attack flaky tests and test end of throttle period (#23799) 2023-02-22 10:28:52 +01:00
Nick Schonning 4ff44be134
Autofix Rubocop Rails/Blank (#23765) 2023-02-22 09:57:56 +09:00
Nick Schonning 8fd3fc404d
Autofix Rubocop Rails/RootPathnameMethods (#23760) 2023-02-22 09:57:15 +09:00
Nick Schonning 48aeab90f6
Ignore JSX files from Prettier (#23777) 2023-02-22 09:56:11 +09:00
Nick Schonning 84cc805cae
Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
Nick Schonning 0cfdd1a401
Enable Rubocop Style/StringConcatenation defaults (#23792) 2023-02-22 09:54:36 +09:00
dependabot[bot] 7ecf783dd3
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] 9d8349f0c4
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] 24d265d604
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] a573641b15
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] 92a0afda28
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
dependabot[bot] 4b964fa605
Bump devise from 4.8.1 to 4.9.0 (#23691) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-02-21 10:41:28 +01:00
Botao Wang 7adde24a95
Fix sidebar cut-off on small screens in admin UI (#23764) 2023-02-21 10:06:13 +01:00
dependabot[bot] 513316f768
Bump stylelint from 15.1.0 to 15.2.0 (#23770) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-02-21 09:41:28 +01:00
dependabot[bot] 57b83ce337
Bump blurhash from 2.0.4 to 2.0.5 (#23771) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-02-21 09:33:30 +01:00
dependabot[bot] d58400d00c
Bump sass from 1.58.2 to 1.58.3 (#23772) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-02-21 09:30:59 +01:00
dependabot[bot] fbbf5c4841
Bump capistrano from 3.17.1 to 3.17.2 (#23775) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-02-21 09:29:07 +01:00
Claire 7207a98d39
Add `lang` tag to native language names in language picker (#23749) 2023-02-21 09:23:39 +01:00
Nick Schonning 434770f580
Autofix Rubocop Rails/FindById (#23762) 2023-02-21 10:21:48 +09:00
Claire 45087c1092
Merge pull request #2117 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-02-20 22:41:20 +01:00
Nick Schonning 35d032500b
Autofix Rubocop Security/IoMethods (#23757) 2023-02-21 03:21:19 +09:00
Nick Schonning 9909b4b653
Autofix Rubocop Rails/WhereEquals (#23759) 2023-02-21 03:20:56 +09:00
Claire d3b4d4d4f3
Change compose form checkbox to native input with `appearance: none` (#22949) 2023-02-20 11:32:27 +01:00
Nick Schonning b65ca7acc9
Update rebase needed job settings (#23746) 2023-02-20 11:02:06 +01:00