Merge branch 'release/0.12' into wdtk

Conflicts:
    locale/he_IL/app.po
    locale/hr_HR/app.po
    locale/nb_NO/app.po
    locale/uk/app.po
    spec/models/info_request_spec.rb

1 files changed, 7 insertions, 0 deletions

diff --git a/spec/integration/view_request_spec.rb b/spec/integration/view_request_spec.rb
index 442721890..3d646cfe7 100644
--- a/spec/integration/view_request_spec.rb
+++ b/spec/integration/view_request_spec.rb
@@ -13,5 +13,12 @@ describe "When viewing requests" do
         response.body.should include("dog.json?unfold=1")
     end
 
+    it 'should not raise a routing error when making a json link for a request with an
+       "action" querystring param' do
+       @dog_request = info_requests(:fancy_dog_request)
+       get "request/#{@dog_request.url_title}?action=add"
+       response.should be_success
+    end
+
 end