diff options
| author | Starfall <root@starfall.blue> | 2019-12-09 19:17:41 -0600 |
|---|---|---|
| committer | Starfall <root@starfall.blue> | 2019-12-09 19:17:41 -0600 |
| commit | 9ee65e89d547ae4a5bc0a5bdb59316ba5c061cfd (patch) | |
| tree | 9bc6bee9f9b95ba51ea747502f6cd740d647850a /config | |
| parent | 6b34fcfef7566105e8d80ab5fee0a539c06cddbf (diff) | |
| parent | 37a9551c3fe59dd1f50a363ce2532c5f00fdf228 (diff) | |
Merge branch 'production'
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/content_security_policy.rb | 4 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb index 810aa2880..c07af3ea8 100644 --- a/config/initializers/content_security_policy.rb +++ b/config/initializers/content_security_policy.rb @@ -31,9 +31,9 @@ if Rails.env.production? p.frame_ancestors :none p.script_src :self, assets_host p.font_src :self, assets_host - p.img_src :self, :data, :blob, *data_hosts + p.img_src :self, :data, :blob, *data_hosts, "pool.jortage.com", "blob.jortage.com", "s3-us-east-2.amazonaws.com" p.style_src :self, :unsafe_inline, assets_host - p.media_src :self, :data, *data_hosts + p.media_src :self, :data, *data_hosts, "pool.jortage.com", "blob.jortage.com", "s3-us-east-2.amazonaws.com" p.frame_src :self, :https p.worker_src :self, :blob, assets_host p.connect_src :self, :blob, :data, Rails.configuration.x.streaming_api_base_url, *data_hosts diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 8386c8cf1..b54e0ff2b 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -59,7 +59,7 @@ en: imports: data: CSV file exported from another Mastodon server invite_request: - text: This will help us review your application + text: 'If you are interested in signing up, please put whether you are a plural system or singlet in the "Why do you want to join" box. This is purely to ward off spam bots. If this is not answered, your request to join the instance will be rejected.' sessions: otp: 'Enter the two-factor code generated by your phone app or use one of your recovery codes:' tag: |