diff options
| author | Surinna Curtis <ekiru.0@gmail.com> | 2017-09-10 14:10:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-10 14:10:30 -0500 |
| commit | 7a9c7d4e0b694e716cb018e3057792b4d86026fa (patch) | |
| tree | 973b16e23a7cbeaf5a43550444e54aa1ace50a46 /config | |
| parent | c9df53044a333276853f7dc7ef2aed6d48df087f (diff) | |
| parent | 932571fa22273e6ff5c229147668c426b4d65326 (diff) | |
Merge pull request #143 from yipdw/sync/upstream
Merge with upstream's 1.6.0
Diffstat (limited to 'config')
| -rw-r--r-- | config/environments/production.rb | 2 | ||||
| -rw-r--r-- | config/locales/en.yml | 3 | ||||
| -rw-r--r-- | config/locales/ja.yml | 3 | ||||
| -rw-r--r-- | config/settings.yml | 1 |
4 files changed, 8 insertions, 1 deletions
diff --git a/config/environments/production.rb b/config/environments/production.rb index 928fd13e5..dc1ce5ed6 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -73,7 +73,7 @@ Rails.application.configure do config.action_mailer.perform_caching = false # E-mails - config.action_mailer.default_options = { from: ENV.fetch('SMTP_FROM_ADDRESS') } + config.action_mailer.default_options = { from: ENV.fetch('SMTP_FROM_ADDRESS', 'notifications@localhost') } config.action_mailer.smtp_settings = { :port => ENV['SMTP_PORT'], diff --git a/config/locales/en.yml b/config/locales/en.yml index 4160745f8..64fc556f3 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -167,6 +167,9 @@ en: unresolved: Unresolved view: View settings: + bootstrap_timeline_accounts: + desc_html: Separate multiple usernames by comma. Only local and unlocked accounts will work. Default when empty is all local admins. + title: Default follows for new users contact_information: email: Business e-mail username: Contact username diff --git a/config/locales/ja.yml b/config/locales/ja.yml index fa9e1d112..fcaa64dab 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -167,6 +167,9 @@ ja: unresolved: 未解決 view: 表示 settings: + bootstrap_timeline_accounts: + desc_html: 複数のユーザー名はコンマで区切ります。ローカルの公開アカウントのみ有効です。指定しない場合は管理者がデフォルトで指定されます。 + title: 新規ユーザーが自動フォローするアカウント contact_information: email: ビジネスメールアドレス username: 連絡先のユーザー名 diff --git a/config/settings.yml b/config/settings.yml index acaab3166..39dfb8f55 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -41,6 +41,7 @@ defaults: &defaults - root - webmaster - administrator + bootstrap_timeline_accounts: '' development: <<: *defaults |