treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/.github/workflows
History
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
..
build-image.yml Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
check-i18n.yml Check for missing i18n strings in CI (#23368) 2023-02-18 12:46:44 +01:00
codeql.yml Run Prettier on YML files (#22345) 2022-12-16 11:11:52 +09:00
lint-css.yml Trigger CI build on .nvmrc change (#23627) 2023-02-16 04:59:45 +01:00
lint-js.yml Rename JSX files with proper `.jsx` extension (#23733) 2023-02-20 03:20:59 +01:00
lint-json.yml Trigger CI build on .nvmrc change (#23627) 2023-02-16 04:59:45 +01:00
lint-md.yml Fix Markdown files with Prettier and check in CI (#21972) 2023-02-20 07:37:28 +01:00
lint-ruby.yml Run bundler-audit on PRs (#23514) 2023-02-18 12:49:09 +01:00
lint-yml.yml Trigger CI build on .nvmrc change (#23627) 2023-02-16 04:59:45 +01:00
rebase-needed.yml Update rebase needed job settings (#23746) 2023-02-20 11:02:06 +01:00
test-js.yml Rename JSX files with proper `.jsx` extension (#23733) 2023-02-20 03:20:59 +01:00
test-migrations-one-step.yml Move db migration CI to GitHub Actions (#23624) 2023-02-19 07:06:34 +01:00
test-migrations-two-step.yml Move db migration CI to GitHub Actions (#23624) 2023-02-19 07:06:34 +01:00