Merge branch 'hotfix/0.30.0.1'

mysociety · Oct 24, 2017 · e9538e3 · e9538e3
2 parents 14d45c5 + fbaf345
commit e9538e3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb
@@ -11,7 +11,7 @@
 load "util.rb"
 
 # Application version
-ALAVETELI_VERSION = '0.30.0.0'
+ALAVETELI_VERSION = '0.30.0.1'
 
 # Add new inflection rules using the following format
 # (all these examples are active by default):

diff --git a/doc/CHANGES.md b/doc/CHANGES.md
@@ -1,3 +1,10 @@
+# 0.30.0.1
+
+## Highlighted Features
+
+* Moved `rake temp:set_daily_summary_times` from upgrade notes
+  for release 0.29.0.0 to release 0.30.0.0 (Louise Crow)
+
 # 0.30.0.0
 
 ## Highlighted Features
@@ -91,6 +98,10 @@
 * This release deprecates the use of purge requests to Varnish. Please make sure
   your site works with `VARNISH_HOST` empty - it will be removed as a param in
   the next release.
+* Run `bundle exec rake temp:set_daily_summary_times` to set some default
+  times for users to receive daily summaries of notifications. This won't have
+  any effect on emails for most users until the new notifications system is
+  rolled out.
 * There are some database structure updates so remember to `rake db:migrate`
 
 ### Changed Templates
@@ -271,10 +282,7 @@
   [notes](https://git.io/vLNg0) on migrating away from 1.8.7; migrating to
   Ruby 2+ should be a similar process. Debian Jessie and Ubuntu 14.04+ include
   packaged versions of Ruby 2+.
-* Run `bundle exec rake temp:set_daily_summary_times` to set some default
-  times for users to receive daily summaries of notifications. This won't have
-  any effect on emails for most users until the new notifications system is
-  rolled out.
+
 
 ### Changed Templates