treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Merging code updates (Unlisted Mode)

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
nicolas 2016-11-22 10:25:17 +01:00 committed by GitHub
parent f9bd3d8808 1788164352
commit 89dab7c534
8 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/settings/profiles_controller.rb
View File

@ -20,7 +20,7 @@ class Settings::ProfilesController < ApplicationController
private private
def account_params def account_params
params.require(:account).permit(:display_name, :note, :avatar, :header) params.require(:account).permit(:display_name, :note, :avatar, :header, :silenced)
end end
def set_account def set_account

4
app/services/fan_out_on_write_service.rb
View File

@ -24,8 +24,8 @@ class FanOutOnWriteService < BaseService
def deliver_to_followers(status) def deliver_to_followers(status)
Rails.logger.debug "Delivering status #{status.id} to followers" Rails.logger.debug "Delivering status #{status.id} to followers"
status.account.followers.find_each do |follower| status.account.followers.where(domain: nil).find_each do |follower|
next if !follower.local? || FeedManager.instance.filter?(:home, status, follower) next if FeedManager.instance.filter?(:home, status, follower)
FeedManager.instance.push(:home, follower, status) FeedManager.instance.push(:home, follower, status)
end end
end end

1
app/views/layouts/application.html.haml
View File

@ -9,6 +9,7 @@
%link{:rel => "manifest", :href => "/manifest.json"}/ %link{:rel => "manifest", :href => "/manifest.json"}/
%meta{:name => "msapplication-config", :content => "/browserconfig.xml"}/ %meta{:name => "msapplication-config", :content => "/browserconfig.xml"}/
%meta{:name => "theme-color", :content => "#2b90d9"}/ %meta{:name => "theme-color", :content => "#2b90d9"}/
%meta{:name => "apple-mobile-web-app-capable", :content => "yes"}/
%title %title
= "#{yield(:page_title)} - " if content_for?(:page_title) = "#{yield(:page_title)} - " if content_for?(:page_title)

1
app/views/settings/profiles/show.html.haml
View File

@ -8,6 +8,7 @@
= f.input :note, placeholder: t('simple_form.labels.defaults.note') = f.input :note, placeholder: t('simple_form.labels.defaults.note')
= f.input :avatar, wrapper: :with_label = f.input :avatar, wrapper: :with_label
= f.input :header, wrapper: :with_label = f.input :header, wrapper: :with_label
= f.input :silenced, as: :boolean, wrapper: :with_label
.actions .actions
= f.button :button, t('generic.save_changes'), type: :submit = f.button :button, t('generic.save_changes'), type: :submit

1
config/environments/production.rb
View File

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

1
config/locales/simple_form.de.yml
View File

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

1
config/locales/simple_form.en.yml
View File

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

1
config/locales/simple_form.es.yml
View File

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