mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-29 07:53:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
nyastodon/app/views/admin/settings
History
Claire 4ed629cd7e Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream added the notion of overriden settings, while we had extra code for
  pseudo-settings (only used to combine flavour and skin in a single select
  field).
  Ported upstream changes.
- `config/i18n-tasks.yml`:
  Upstream added `simple_form.overridden` to `ignore_unused`,
  we had `simple_form.glitch_only`.
  Added `simple_form.glitch_only` as well.
2023-09-02 14:44:47 +02:00
..
about Consolidate inclusion of admin js pack link (#26628) 2023-08-24 09:56:23 +02:00
appearance Consolidate inclusion of admin js pack link (#26628) 2023-08-24 09:56:23 +02:00
branding Consolidate inclusion of admin js pack link (#26628) 2023-08-24 09:56:23 +02:00
content_retention Consolidate inclusion of admin js pack link (#26628) 2023-08-24 09:56:23 +02:00
discovery Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream 2023-09-02 14:44:47 +02:00
other Add back missing glitch-soc admin settings (#1919) 2022-11-12 13:24:53 +01:00
registrations Consolidate inclusion of admin js pack link (#26628) 2023-08-24 09:56:23 +02:00
shared Merge branch 'main' into glitch-soc/merge-upstream 2023-07-19 07:35:51 +02:00