Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-26 20:36:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'b7902225d698a107df2cf8b4ca221caad38fa464' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored tests to stub `StatusLengthValidator::MAX_CHARS`
  while glitch-soc had custom code to read from `MAX_TOOT_CHARS`.
  Switched to using upstream's implementation of the tests.
This commit is contained in:
Claire
2024-05-04 16:28:30 +02:00
parent 4b82dc84f5 b7902225d6
commit 3789d9f825
49 changed files with 911 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/lint-css.yml vendored
View File

@@ -38,9 +38,5 @@ jobs:
- name: Set up Javascript environment
uses: ./.github/actions/setup-javascript
- uses: xt0rted/stylelint-problem-matcher@v1
- run: echo "::add-matcher::.github/stylelint-matcher.json"
- name: Stylelint
run: yarn lint:css
run: yarn lint:css -f github