about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-10-09 12:11:14 +0200
committerGitHub <noreply@github.com>2018-10-09 12:11:14 +0200
commit4134a10549a833ad5ab18b3c579304919d594ce1 (patch)
tree696f4b453ad029ffda3d0925c484c11b27b95cc6 /config
parentd0b1369a853dc2e5b7934c148547f71f8d103859 (diff)
parentb368d3c15ddfca983e89ff2858f7f03eb7147d83 (diff)
Merge pull request #770 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config')
-rw-r--r--config/environments/development.rb2
-rw-r--r--config/initializers/open_uri_redirection.rb2
-rw-r--r--config/locales/en.yml3
-rw-r--r--config/routes.rb1
4 files changed, 6 insertions, 2 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb
index b6478f16e..0791b82ab 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -87,7 +87,7 @@ Rails.application.configure do
   config.x.otp_secret = ENV.fetch('OTP_SECRET', '1fc2b87989afa6351912abeebe31ffc5c476ead9bf8b3d74cbc4a302c7b69a45b40b1bbef3506ddad73e942e15ed5ca4b402bf9a66423626051104f4b5f05109')
 end
 
-ActiveRecordQueryTrace.enabled = ENV.fetch('QUERY_TRACE_ENABLED') { false }
+ActiveRecordQueryTrace.enabled = ENV['QUERY_TRACE_ENABLED'] == 'true'
 
 module PrivateAddressCheck
   def self.private_address?(*)
diff --git a/config/initializers/open_uri_redirection.rb b/config/initializers/open_uri_redirection.rb
index ea2dcffea..e9de85bdc 100644
--- a/config/initializers/open_uri_redirection.rb
+++ b/config/initializers/open_uri_redirection.rb
@@ -2,7 +2,7 @@ require 'open-uri'
 
 module OpenURI
   def self.redirectable?(uri1, uri2) # :nodoc:
-    uri1.scheme.downcase == uri2.scheme.downcase ||
+    uri1.scheme.casecmp(uri2.scheme).zero? ||
       (/\A(?:http|https|ftp)\z/i =~ uri1.scheme && /\A(?:http|https|ftp)\z/i =~ uri2.scheme)
   end
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fd36d4727..553c62e58 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -368,6 +368,9 @@ en:
       hero:
         desc_html: Displayed on the frontpage. At least 600x100px recommended. When not set, falls back to instance thumbnail
         title: Hero image
+      mascot:
+        desc_html: Displayed on multiple pages. At least 293px × 205px recommended. When not set, falls back to instance thumbnail
+        title: Mascot image
       peers_api_enabled:
         desc_html: Domain names this instance has encountered in the fediverse
         title: Publish list of discovered instances
diff --git a/config/routes.rb b/config/routes.rb
index 01cb6b140..8895b7272 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -267,6 +267,7 @@ Rails.application.routes.draw do
       resources :streaming, only: [:index]
       resources :custom_emojis, only: [:index]
       resources :suggestions, only: [:index, :destroy]
+      resources :conversations, only: [:index]
 
       get '/search', to: 'search#index', as: :search