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

Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/controllers/application_controller.rb`:
  Not a real conflict, upstream fixed a bug in a line adjacent to code
  modified by glitch-soc.
  Ported upstream's change.
This commit is contained in:
Claire
2024-02-27 19:20:57 +01:00
parent e1cb7c9b23 6f7615ba86
commit a482932649
29 changed files with 302 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/lint-haml.yml vendored
View File

@@ -36,4 +36,4 @@ jobs:
- name: Run haml-lint
run: |
echo "::add-matcher::.github/workflows/haml-lint-problem-matcher.json"
bundle exec haml-lint
bundle exec haml-lint --reporter github