Merging code updates (Unlisted Mode)

This commit is contained in:
nicolas 2016-11-22 10:25:17 +01:00 committed by GitHub
commit 89dab7c534
8 changed files with 9 additions and 3 deletions

View file

@ -13,6 +13,7 @@ Rails.application.configure do
# Full error reports are disabled and caching is turned on.
config.consider_all_requests_local = false
config.action_controller.perform_caching = true
config.action_controller.asset_host = ENV['CDN_HOST']
# Disable serving static files from the `/public` folder by default since
# Apache or NGINX already handles this.

View file

@ -15,6 +15,7 @@ de:
note: Über mich
password: Passwort
username: Nutzername
silenced: Öffentliche Beiträge nicht auflisten
notification_emails:
favourite: E-mail senden, wenn jemand meinen Beitrag favorisiert
follow: E-mail senden, wenn mir jemand folgt

View file

@ -15,6 +15,7 @@ en:
note: Bio
password: Password
username: Username
silenced: Unlisted mode
notification_emails:
favourite: Send e-mail when someone favourites your status
follow: Send e-mail when someone follows you

View file

@ -15,6 +15,7 @@ es:
note: Biografía
password: Contraseña
username: Nombre de usuario
silenced: No listado
notification_emails:
favourite: Enviar correo electrónico cuando alguien de a favorito en su publicación
follow: Enviar correo electrónico cuando alguien le siga