Skip to content
Extraits de code Groupes Projets
Valider 0fedca33 rédigé par Sean Tilley's avatar Sean Tilley
Parcourir les fichiers

Merge pull request #3658 from movilla/community_spo

Fix show post Community Spotlight on stream [ci skip]
parents f594471c f6f5a62f
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
# 0.0.2.0pre # 0.0.2.0pre
* Fix javascripts problem with read/unread notifications. [#3656](https://github.com/diaspora/diaspora/pull/3656) ## Refactor
* MessagesController. [#3657](https://github.com/diaspora/diaspora/pull/3657)
## Add Features
* Add password_confirmation field to registration page. [#3647](https://github.com/diaspora/diaspora/pull/3647) * Add password_confirmation field to registration page. [#3647](https://github.com/diaspora/diaspora/pull/3647)
## Bug Fixes
* Fix error with show post Community Spotlight. [#3658](https://github.com/diaspora/diaspora/pull/3658)
* Fix javascripts problem with read/unread notifications. [#3656](https://github.com/diaspora/diaspora/pull/3656)
* Fix error with open/close registrations. [#3649](https://github.com/diaspora/diaspora/pull/3649) * Fix error with open/close registrations. [#3649](https://github.com/diaspora/diaspora/pull/3649)
* Fix javascripts error in invitations facebox. [#3638](https://github.com/diaspora/diaspora/pull/3638) * Fix javascripts error in invitations facebox. [#3638](https://github.com/diaspora/diaspora/pull/3638)
* Fix css overflow problem in aspect dropdown on welcome page. [#3637](https://github.com/diaspora/diaspora/pull/3637) * Fix css overflow problem in aspect dropdown on welcome page. [#3637](https://github.com/diaspora/diaspora/pull/3637)
......
...@@ -77,6 +77,6 @@ class Stream::Multi < Stream::Base ...@@ -77,6 +77,6 @@ class Stream::Multi < Stream::Base
# @return [Boolean] # @return [Boolean]
def include_community_spotlight? def include_community_spotlight?
AppConfig.environment.community_spotlight.enable? && user.show_community_spotlight_in_stream? AppConfig.settings.community_spotlight.enable? && user.show_community_spotlight_in_stream?
end end
end end
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter