Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master

2017-04-11 20:43:56 +02:00
parent b723ee73fc 06444bf050
commit 2a7602cad4
16 changed files with 144 additions and 18 deletions
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@ -29,6 +29,7 @@ en:
        setting_default_privacy: Post privacy
        type: Import type
        username: Username
+        setting_boost_modal: Show confirmation dialog before boosting
      interactions:
        must_be_follower: Block notifications from non-followers
        must_be_following: Block notifications from people you don't follow
--- a/config/settings.yml
+++ b/config/settings.yml
@ -14,6 +14,7 @@ defaults: &defaults
  site_contact_email: ''
  open_registrations: true
  closed_registrations_message: ''
+  boost_modal: true
  notification_emails:
    follow: false
    reblog: false