diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/environments/development.rb | 5 | ||||
| -rw-r--r-- | config/environments/production.rb | 2 | ||||
| -rw-r--r-- | config/initializers/ostatus.rb | 2 | ||||
| -rw-r--r-- | config/locales/en.yml | 6 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 1 | ||||
| -rw-r--r-- | config/routes.rb | 3 |
6 files changed, 12 insertions, 7 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb index 51cb43e5d..6157f20d3 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -20,11 +20,12 @@ Rails.application.configure do host: ENV['REDIS_HOST'] || 'localhost', port: ENV['REDIS_PORT'] || 6379, db: 0, - namespace: 'cache' + namespace: 'cache', + expires_in: 1.minute, } config.public_file_server.headers = { - 'Cache-Control' => 'public, max-age=172800' + 'Cache-Control' => 'public, max-age=172800', } else config.action_controller.perform_caching = false diff --git a/config/environments/production.rb b/config/environments/production.rb index eaddba522..62ea217ef 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -64,7 +64,7 @@ Rails.application.configure do password: ENV.fetch('REDIS_PASSWORD') { false }, db: 0, namespace: 'cache', - expires_in: 20.minutes + expires_in: 20.minutes, } # Enable serving of images, stylesheets, and JavaScripts from an asset server. diff --git a/config/initializers/ostatus.rb b/config/initializers/ostatus.rb index faa9940b0..fb0b8b7fe 100644 --- a/config/initializers/ostatus.rb +++ b/config/initializers/ostatus.rb @@ -10,8 +10,10 @@ Rails.application.configure do config.x.use_s3 = ENV['S3_ENABLED'] == 'true' config.action_mailer.default_url_options = { host: host, protocol: https ? 'https://' : 'http://', trailing_slash: false } + config.x.streaming_api_base_url = 'http://localhost:4000' if Rails.env.production? config.action_cable.allowed_request_origins = ["http#{https ? 's' : ''}://#{host}"] + config.x.streaming_api_base_url = ENV.fetch('STREAMING_API_BASE_URL') { "http#{https ? 's' : ''}://#{host}" } end end diff --git a/config/locales/en.yml b/config/locales/en.yml index 16b406745..b1b1e7995 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -97,8 +97,12 @@ en: settings: Settings two_factor_auth: Two-factor Authentication statuses: - over_character_limit: character limit of %{max} exceeded open_in_web: Open in web + over_character_limit: character limit of %{max} exceeded + visibilities: + private: Only show to followers + public: Public + unlisted: Public, but do not display on the public timeline stream_entries: click_to_show: Click to show favourited: favourited a post by diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 09957c914..4d1758f82 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -23,6 +23,7 @@ en: note: Bio otp_attempt: Two-factor code password: Password + setting_default_privacy: Post privacy username: Username interactions: must_be_follower: Block notifications from non-followers diff --git a/config/routes.rb b/config/routes.rb index 699f56833..e17d54995 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -117,9 +117,6 @@ Rails.application.routes.draw do resources :blocks, only: [:index] resources :favourites, only: [:index] - post '/devices/register', to: 'devices#register', as: :register_device - post '/devices/unregister', to: 'devices#unregister', as: :unregister_device - resources :follow_requests, only: [:index] do member do post :authorize |