diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-02-09 09:25:53 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-02-09 09:25:53 -0600 |
| commit | 020b40efdb2e4ddac14bea81ad60512d51eb7fe5 (patch) | |
| tree | b9afe17c1257490af354f76d6e1c1f1b3788e546 /config | |
| parent | 5ba2c300d8ab0e3adc58a380162b66abafbb3bb8 (diff) | |
| parent | 235c14c79d620d47012a08425324df222a136457 (diff) | |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: .travis.yml app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_detailed_status.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/simple_form.en.yml | 1 | ||||
| -rw-r--r-- | config/settings.yml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index e097e80ae..48b741186 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -46,6 +46,7 @@ en: setting_default_sensitive: Always mark media as sensitive setting_delete_modal: Show confirmation dialog before deleting a toot setting_favourite_modal: Show confirmation dialog before favouriting + setting_display_sensitive_media: Always show media marked as sensitive setting_noindex: Opt-out of search engine indexing setting_reduce_motion: Reduce motion in animations setting_skin: Skin diff --git a/config/settings.yml b/config/settings.yml index 592be1a8a..580a20895 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -25,6 +25,7 @@ defaults: &defaults favourite_modal: false delete_modal: true auto_play_gif: false + display_sensitive_media: false reduce_motion: false system_font_ui: false noindex: false |