diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-10-21 19:10:50 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-10-21 19:10:50 +0200 |
| commit | ec49aa81753ac71fa26b2ee86448fa5b481d49e4 (patch) | |
| tree | 4b775e2e094af4886f24514ba6026f82af8e814a /app/views/settings | |
| parent | 29870d2be6c0e78132416b5561aba20d6ca3c746 (diff) | |
| parent | ca56527140034952002f8f7334da9f94c4f486a8 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `.github/dependabot.yml`: Updated upstream, we deleted it to not be flooded by Depandabot. Kept deleted. - `Gemfile.lock`: Puma updated on both sides, went for the most recent version. - `app/controllers/api/v1/mutes_controller.rb`: Upstream updated the serializer to support timed mutes, while glitch-soc added a custom API ages ago to get information that is already available elsewhere. Dropped the glitch-soc-specific API, went with upstream changes. - `app/javascript/core/admin.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/javascript/packs/public.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/models/mute.rb`: 🤷 - `app/models/user.rb`: New user setting added upstream while we have glitch-soc-specific user settings. Added upstream's user setting. - `config/settings.yml`: Upstream added a new user setting close to a user setting we had changed the defaults for. Added the new upstream setting. - `package.json`: Upstream dependency updated “too close” to a glitch-soc-specific dependency. No real conflict. Updated the dependency.
Diffstat (limited to 'app/views/settings')
| -rw-r--r-- | app/views/settings/preferences/appearance/show.html.haml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml index 5fc865814..ccea2e9b7 100644 --- a/app/views/settings/preferences/appearance/show.html.haml +++ b/app/views/settings/preferences/appearance/show.html.haml @@ -27,6 +27,7 @@ .fields-group = f.input :setting_auto_play_gif, as: :boolean, wrapper: :with_label, recommended: true = f.input :setting_reduce_motion, as: :boolean, wrapper: :with_label + = f.input :setting_disable_swiping, as: :boolean, wrapper: :with_label = f.input :setting_system_font_ui, as: :boolean, wrapper: :with_label = f.input :setting_system_emoji_font, as: :boolean, wrapper: :with_label |