diff options
| author | ThibG <thib@sitedethib.com> | 2018-06-16 15:08:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-16 15:08:52 +0200 |
| commit | c08a2495589183f39cf44ac4c9b71f81dd9dacdc (patch) | |
| tree | 15f4291e3d955f17489f3c43ab711dc536c32bb8 /config | |
| parent | e8ccac468af9530b4f4d38598859efdb2eb48976 (diff) | |
| parent | db200226b805db324a8efdfb951d7725eac3f9da (diff) | |
Merge pull request #544 from ThibG/glitch-soc/merge-upstream
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/timeout.rb | 6 | ||||
| -rw-r--r-- | config/initializers/twitter_regex.rb | 2 | ||||
| -rw-r--r-- | config/locales/en.yml | 1 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/config/initializers/timeout.rb b/config/initializers/timeout.rb deleted file mode 100644 index de87fd906..000000000 --- a/config/initializers/timeout.rb +++ /dev/null @@ -1,6 +0,0 @@ -Rack::Timeout::Logger.disable -Rack::Timeout.service_timeout = false - -if Rails.env.production? - Rack::Timeout.service_timeout = 90 -end diff --git a/config/initializers/twitter_regex.rb b/config/initializers/twitter_regex.rb index 7fa828300..c227f92d3 100644 --- a/config/initializers/twitter_regex.rb +++ b/config/initializers/twitter_regex.rb @@ -30,7 +30,7 @@ module Twitter ( # $1 total match (#{REGEXEN[:valid_url_preceding_chars]}) # $2 Preceeding chracter ( # $3 URL - (https?:\/\/)? # $4 Protocol (optional) + ((https?|dat|dweb|ipfs|ipns|ssb|gopher):\/\/)? # $4 Protocol (optional) (#{REGEXEN[:valid_domain]}) # $5 Domain(s) (?::(#{REGEXEN[:valid_port_number]}))? # $6 Port number (optional) (/#{REGEXEN[:valid_url_path]}*)? # $7 URL Path and anchor diff --git a/config/locales/en.yml b/config/locales/en.yml index fdc64fd93..d2e9766a9 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -515,6 +515,7 @@ en: '86400': 1 day expires_in_prompt: Never generate: Generate + invited_by: 'You were invited by:' max_uses: one: 1 use other: "%{count} uses" diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 74c2084d5..f15025061 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -3,6 +3,7 @@ en: simple_form: hints: defaults: + autofollow: People who sign up through the invite will automatically follow you avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 400x400px bot: This account mainly performs automated actions and might not be monitored digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence @@ -30,6 +31,7 @@ en: name: Label value: Content defaults: + autofollow: Invite to follow your account avatar: Avatar bot: This is a bot account confirm_new_password: Confirm new password |