Commit graph

7 commits

Author SHA1 Message Date
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
Nick Schonning
a9472f8ff1
Fix Markdown files with Prettier and check in CI (#21972) 2023-02-20 07:37:28 +01:00
Claire
b248aa4d3e Merge branch 'main' into glitch-soc/merge-upstream 2022-12-21 15:59:39 +01:00
Kai
2bad619d17
Change HTTP to HTTPS for links in CODE_OF_CONDUCT (#22465) 2022-12-19 09:46:22 +09:00
ThibG
a03fb7b703 Change e-mail contact for CoC enforcement 2019-06-06 17:42:07 +02:00
beatrix
b7a7eb84dd
update code of conduct email address 2017-11-21 11:01:28 -05:00
Eugen Rochko
92aaa55f06
Add code of conduct from GitHub generator (#5674) 2017-11-13 17:28:55 +01:00