Merge branch 'release/0.12' into wdtk

2 files changed, 0 insertions, 11 deletions

diff --git a/config/application.rb b/config/application.rb
index 8bfec7f4b..92fd30685 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -71,10 +71,5 @@ module Alaveteli
     # Insert a bit of middleware code to prevent uneeded cookie setting.
     require "#{Rails.root}/lib/whatdotheyknow/strip_empty_sessions"
     config.middleware.insert_before ActionDispatch::Session::CookieStore, WhatDoTheyKnow::StripEmptySessions, :key => '_wdtk_cookie_session', :path => "/", :httponly => true
-
-    # Ignore ACCEPT headers as a specification of format, only pay attention to
-    # formats specified in URLs
-    config.action_dispatch.ignore_accept_header = true
-
   end
 end
diff --git a/spec/controllers/general_controller_spec.rb b/spec/controllers/general_controller_spec.rb
index 61d847cec..0eda73c51 100644
--- a/spec/controllers/general_controller_spec.rb
+++ b/spec/controllers/general_controller_spec.rb
@@ -349,10 +349,4 @@ describe GeneralController, 'when using xapian search' do
         response.body.should include('Track this search')
     end
 
-    it 'should ignore an odd ACCEPTS header' do
-        request.env['HTTP_ACCEPT'] = '*/*;q=0.01'
-        get :search, :combined => '"fancy dog"'
-        response.should be_success
-    end
-
 end