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

Merge pull request #5885 from mrbrdo/server-script-fix

fix broken output of script/server
parents c95dd685 8dcc5faf
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
* Hide manage services link in the publisher on certain pages [#5854](https://github.com/diaspora/diaspora/pull/5854) * Hide manage services link in the publisher on certain pages [#5854](https://github.com/diaspora/diaspora/pull/5854)
* Fix notification mails for limited posts [#5877](https://github.com/diaspora/diaspora/pull/5877) * Fix notification mails for limited posts [#5877](https://github.com/diaspora/diaspora/pull/5877)
* Fix medium and small avatar URLs when using Camo [#5883](https://github.com/diaspora/diaspora/pull/5883) * Fix medium and small avatar URLs when using Camo [#5883](https://github.com/diaspora/diaspora/pull/5883)
* Improve output of script/server [#5885](https://github.com/diaspora/diaspora/pull/5885)
## Features ## Features
* Hide post title of limited post in comment notification email [#5843](https://github.com/diaspora/diaspora/pull/5843) * Hide post title of limited post in comment notification email [#5843](https://github.com/diaspora/diaspora/pull/5843)
......
...@@ -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 'home-*.css' -print -quit)" ] if [ "$RAILS_ENV" = "production" -a -z "$(find public/assets -maxdepth 1 -name 'home-*.css' -print -quit 2>/dev/null)" ]
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
...@@ -159,7 +159,7 @@ diaspora.yml.example ...@@ -159,7 +159,7 @@ diaspora.yml.example
fi fi
# Start Diaspora # Start Diaspora
echo -n "Starting Diaspora in $RAILS_ENV mode on port $port " printf "Starting Diaspora in $RAILS_ENV mode on port $port "
if [ "$embed_sidekiq_worker" = "true" ] if [ "$embed_sidekiq_worker" = "true" ]
then then
echo "with a Sidekiq worker embedded into Unicorn." echo "with a Sidekiq worker embedded into Unicorn."
......
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