Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-26 12:26:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,239 Commits 74 Branches 58 Tags
dfbf96021e20ecf329bce72fe8010fc6bbef3dbf
Commit Graph

6 Commits

Author SHA1 Message Date
Claire
f62bafc7a1 Fix HAML linting issue 2023-12-17 16:37:11 +01:00
Claire
b19d4eb43d Fix HAML linting issues 2023-10-24 20:53:58 +02:00
Claire
c04f2d0cf7 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  had a different lambda due to its theming system.
  Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  removed some code just after the lambda.
  Applied the same code style changes.
 2023-07-17 19:02:23 +02:00
Matt Jankowski
361dd43235 Fix haml-lint Rubocop lambda cop (#25946) 2023-07-17 15:07:29 +02:00
Claire
cb19be67d1 Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
Eugen Rochko
7c152acb2c Change settings area to be separated into categories in admin UI (#19407) 
And update all descriptions
 2022-10-22 11:44:41 +02:00