nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'release/0.5.0.0-RC' into develop

Browse source
This commit is contained in:
Jonne Haß 2015-04-15 15:41:41 +02:00
commit f11a6b5417
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -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)

2
script/server
View file

@ -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