Skip to content
Extraits de code Groupes Projets
Valider f11a6b54 rédigé par Jonne Haß's avatar Jonne Haß
Parcourir les fichiers

Merge branch 'release/0.5.0.0-RC' into develop

parents b3575ab5 2613896c
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -176,6 +176,7 @@ diaspora* no longer adds a `div.container` to wrap custom splash pages. This add ...@@ -176,6 +176,7 @@ diaspora* no longer adds a `div.container` to wrap custom splash pages. This add
* Fix pagination design on conversations page [#5791](https://github.com/diaspora/diaspora/pull/5791) * Fix pagination design on conversations page [#5791](https://github.com/diaspora/diaspora/pull/5791)
* Prevent inserting posts into the wrong stream [#5838](https://github.com/diaspora/diaspora/pull/5838) * Prevent inserting posts into the wrong stream [#5838](https://github.com/diaspora/diaspora/pull/5838)
* Update help section [#5857](https://github.com/diaspora/diaspora/pull/5857) * Update help section [#5857](https://github.com/diaspora/diaspora/pull/5857)
* Fix asset precompilation check in script/server [#5863](https://github.com/diaspora/diaspora/pull/5863)
## Features ## Features
* Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105) * Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)
......
...@@ -120,7 +120,7 @@ then ...@@ -120,7 +120,7 @@ then
fi fi
# Check if assets are precompiled # Check if assets are precompiled
if [ "$RAILS_ENV" = "production" -a -z "$(find public/assets -maxdepth 1 -name 'default-*.css' -print -quit)" ] if [ "$RAILS_ENV" = "production" -a -z "$(find public/assets -maxdepth 1 -name 'home-*.css' -print -quit)" ]
then then
fatal "You're running in production mode without having assets fatal "You're running in production mode without having assets
precompiled. Now and after each update before you restart the precompiled. Now and after each update before you restart the
......
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