diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-01-24 17:16:37 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-01-24 17:16:37 +0000 |
| commit | 5e3e8e6d709a0dd6e490de8d14ac61ab951e941a (patch) | |
| tree | f65b874012ed17e848493fa02e75902cd9a0bee6 | |
| parent | 897fdeeccad25bdf5b069c9de397ed65085776dd (diff) | |
| parent | c4907c10a9cba57f203f0ed322ba27220014562e (diff) | |
Merge branch 'hotfix/0.16.0.2' into rails-3-develop
| -rw-r--r-- | Capfile | 4 | ||||
| -rw-r--r-- | config/general.yml-example | 1 | ||||
| -rw-r--r-- | doc/CHANGES.md | 8 |
3 files changed, 11 insertions, 2 deletions
@@ -1,4 +1,4 @@ load 'deploy' # Uncomment if you are using Rails' asset pipeline - # load 'deploy/assets' -load 'config/deploy' # remove this line to skip loading any of the default tasks
\ No newline at end of file +load 'deploy/assets' +load 'config/deploy' # remove this line to skip loading any of the default tasks diff --git a/config/general.yml-example b/config/general.yml-example index bd835494b..2bead2021 100644 --- a/config/general.yml-example +++ b/config/general.yml-example @@ -242,3 +242,4 @@ SHARED_DIRECTORIES: - cache/ - lib/acts_as_xapian/xapiandbs/ - vendor/bundle + - public/assets diff --git a/doc/CHANGES.md b/doc/CHANGES.md index b4bed110b..8f86f1c3a 100644 --- a/doc/CHANGES.md +++ b/doc/CHANGES.md @@ -54,6 +54,14 @@ email configs). * If you have any custom styles that rely on the absolute positioning of the 'banner' and 'wrapper' elements, they may need to be updated. +* Cached HTML versions of attachments in cache/attachments_production/ + will have obsolete links to `/stylesheets/main.css` and + `/images/navimg/logo-trans-small.png`. You can resolve these by either + moving the cached attachments away and allowing them to be regenerated + on demand, or by symlinking `public/stylesheets/main.css` to + `public/assets/application.css` and + `public/images/navimg/logo-trans-small.png` to + `public/assets/navimg/logo-trans-small.png`. # Version 0.15 |