aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2015-04-07 11:58:17 +0100
committerLouise Crow <louise.crow@gmail.com>2015-04-07 11:58:17 +0100
commitcd0823a4bae3e98301e2eeea50c6d0f5c9c8e83d (patch)
treef0b00375029befed51141073ed7ddb132b6ba587
parentffb17f312c312fdba49ab961520d423bdde22503 (diff)
parent6957323c90fe4b69b06e570862412f018a6e48ae (diff)
Merge branch 'hotfix/0.21.0.7'0.21.0.7
Conflicts: config/initializers/alaveteli.rb
-rw-r--r--config/initializers/alaveteli.rb2
-rw-r--r--doc/CHANGES.md4
2 files changed, 4 insertions, 2 deletions
diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb
index 7465a5ca1..bb94306c3 100644
--- a/config/initializers/alaveteli.rb
+++ b/config/initializers/alaveteli.rb
@@ -10,7 +10,7 @@ load "debug_helpers.rb"
load "util.rb"
# Application version
-ALAVETELI_VERSION = '0.21.0.6'
+ALAVETELI_VERSION = '0.21.0.7'
# 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
index 961a851a3..7b0341b30 100644
--- a/doc/CHANGES.md
+++ b/doc/CHANGES.md
@@ -48,7 +48,9 @@
* Admin route names have been standardised so if you have overridden
templates that refer to admin routes, check the original templates to
- see if these need to be changed.
+ see if these need to be changed. URLs in rreviously sent admin emails about
+ requested changes to authorities will need to be tweaked to work - from
+ `admin/body/new?change_request_id=n` to `admin/bodies/new?change_request_id=n`
* If you override the `app/views/user/_signin.html.erb` or
`app/view/user/_signup.html.erb` templates, check the tabindex order
is still sensible - the order of the elements on the page has changed