aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Capfile4
-rw-r--r--config/general.yml-example1
-rw-r--r--doc/CHANGES.md8
3 files changed, 11 insertions, 2 deletions
diff --git a/Capfile b/Capfile
index 6a798eb2b..447fe751c 100644
--- a/Capfile
+++ b/Capfile
@@ -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