diff options
| author | nicolas <nclm@users.noreply.github.com> | 2016-11-22 10:25:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-22 10:25:17 +0100 |
| commit | 89dab7c5341806c248b5ae005e5c96116c2279b6 (patch) | |
| tree | 9a76a7bae30d014bc59ab6b388a2685d0c7a4a50 /app | |
| parent | f9bd3d8808e4e83426913e5fbf18174b9121f3e4 (diff) | |
| parent | 1788164352db23917c540e42a839908ecc4e0463 (diff) | |
Merging code updates (Unlisted Mode)
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/settings/profiles_controller.rb | 2 | ||||
| -rw-r--r-- | app/services/fan_out_on_write_service.rb | 4 | ||||
| -rw-r--r-- | app/views/layouts/application.html.haml | 1 | ||||
| -rw-r--r-- | app/views/settings/profiles/show.html.haml | 1 |
4 files changed, 5 insertions, 3 deletions
diff --git a/app/controllers/settings/profiles_controller.rb b/app/controllers/settings/profiles_controller.rb index deff8fc7e..4b2b5a131 100644 --- a/app/controllers/settings/profiles_controller.rb +++ b/app/controllers/settings/profiles_controller.rb @@ -20,7 +20,7 @@ class Settings::ProfilesController < ApplicationController private def account_params - params.require(:account).permit(:display_name, :note, :avatar, :header) + params.require(:account).permit(:display_name, :note, :avatar, :header, :silenced) end def set_account diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb index 70cf06e02..78cb0b13f 100644 --- a/app/services/fan_out_on_write_service.rb +++ b/app/services/fan_out_on_write_service.rb @@ -24,8 +24,8 @@ class FanOutOnWriteService < BaseService def deliver_to_followers(status) Rails.logger.debug "Delivering status #{status.id} to followers" - status.account.followers.find_each do |follower| - next if !follower.local? || FeedManager.instance.filter?(:home, status, follower) + status.account.followers.where(domain: nil).find_each do |follower| + next if FeedManager.instance.filter?(:home, status, follower) FeedManager.instance.push(:home, follower, status) end end diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 7e28d27ec..87f98198c 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -9,6 +9,7 @@ %link{:rel => "manifest", :href => "/manifest.json"}/ %meta{:name => "msapplication-config", :content => "/browserconfig.xml"}/ %meta{:name => "theme-color", :content => "#2b90d9"}/ + %meta{:name => "apple-mobile-web-app-capable", :content => "yes"}/ %title = "#{yield(:page_title)} - " if content_for?(:page_title) diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml index c2f1adb12..e5f8a46c4 100644 --- a/app/views/settings/profiles/show.html.haml +++ b/app/views/settings/profiles/show.html.haml @@ -8,6 +8,7 @@ = f.input :note, placeholder: t('simple_form.labels.defaults.note') = f.input :avatar, wrapper: :with_label = f.input :header, wrapper: :with_label + = f.input :silenced, as: :boolean, wrapper: :with_label .actions = f.button :button, t('generic.save_changes'), type: :submit |