| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2023-02-25 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| 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-20 | Fix Markdown files with Prettier and check in CI (#21972) | Nick Schonning | |
| 2022-12-21 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| 2022-12-19 | Change HTTP to HTTPS for links in CODE_OF_CONDUCT (#22465) | Kai | |
| 2019-06-06 | Change e-mail contact for CoC enforcement | ThibG | |
| 2017-11-21 | update code of conduct email address | beatrix | |
| 2017-11-13 | Add code of conduct from GitHub generator (#5674) | Eugen Rochko | |
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |
path: root/CODE_OF_CONDUCT.md