Claire
085a1197da
Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/simple_form.rb`:
Upstream added a new simple_form component, where we had an extra one.
Kept both components.
2023-06-10 16:22:14 +02:00
Jed Fox
e24a587f84
Consistently use middle dot (·) instead of bullet (•) to separate items ( #25248 )
2023-06-02 19:58:18 +02:00
Claire
179f1d3a78
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/pending_accounts/index.html.haml`:
Removed upstream, while it had glitch-soc-specific changes to accomodate
for glitch-soc's theming system.
Removed the file.
Additional changes:
- `app/views/admin/accounts/index.html.haml':
Accomodate for glitch-soc's theming system.
2021-12-16 16:20:44 +01:00
Eugen Rochko
7bf5924339
Add batch suspend for accounts in admin UI ( #17009 )
2021-12-05 21:48:39 +01:00
Eugen Rochko
79f71206de
Add subresource integrity for JS and CSS assets ( #15096 )
...
Fix #2744
2020-11-06 11:56:31 +01:00
Thibaut Girka
a56cf3be14
Fix IP blocks in admin panel
...
It was broken due to discrepancies between upstream and glitch-soc's
theming system.
2020-10-28 23:55:41 +01:00
Eugen Rochko
da4c730c47
Add IP-based rules ( #14963 )
2020-10-12 16:33:49 +02:00
