Age | Commit message (Collapse) | Author |
|
interface (#23574)
|
|
|
|
|
|
(#23787)
|
|
|
|
destructive than it claims (#23805)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Merge upstream changes
|
|
|
|
|
|
|
|
Port 8000a8f2309d428c2ce72fe5ffba940754d55339 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port f4f91bc295fd423bdc81ca17f0f9491ed6cd897e to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 7adde24a95218048f14c29bee0d25afaeae99509 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 7207a98d3990124c6dc1df2187475695c800e65f to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 44a7d87cb1f5df953b6c14c16c59e2e4ead1bcb9 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
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.
|
|
|
|
|
|
|
|
(#23320)
|
|
|
|
|
|
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
|
|
(#23801)
|
|
|
|
|
|
|
|
|
|
|
|
|