diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-11-26 22:53:55 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-11-26 22:53:55 +0100 |
| commit | 9b861d56a9646e75caf1f7d60fa9eade566d3740 (patch) | |
| tree | a45059ea258e035c6f63e966973629b9cd0766b8 /app/models/form/admin_settings.rb | |
| parent | 97151840b02499a0cec1360907a6b86a1df02b3b (diff) | |
| parent | 1c826471e7d964f0fdb2dc2b89dcd5a19c017538 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.env.production.sample`: Copied upstream changes. - `app/controllers/settings/identity_proofs_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `app/controllers/well_known/keybase_proof_config_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `lib/mastodon/statuses_cli.rb`: Minor conflict due to an optimization that wasn't shared between the two versions. Copied upstream's version.
Diffstat (limited to 'app/models/form/admin_settings.rb')
| -rw-r--r-- | app/models/form/admin_settings.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb index 0276ec058..3202d1fc2 100644 --- a/app/models/form/admin_settings.rb +++ b/app/models/form/admin_settings.rb @@ -27,7 +27,6 @@ class Form::AdminSettings custom_css profile_directory hide_followers_count - enable_keybase flavour_and_skin thumbnail hero @@ -53,7 +52,6 @@ class Form::AdminSettings preview_sensitive_media profile_directory hide_followers_count - enable_keybase show_reblogs_in_public_timelines show_replies_in_public_timelines trends |