Merge branch 'feature/hide-individual-responses' into rails-3-develop

Conflicts:
    Gemfile
    app/views/admin_request/edit_outgoing.html.erb
    config/packages
    doc/CHANGES.md
    doc/INSTALL.md
    spec/models/info_request_spec.rb
    spec/models/public_body_spec.rb

1 files changed, 0 insertions, 13 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 2ce44011f..cbdffc441 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -211,19 +211,6 @@ class ApplicationController < ActionController::Base
         end
     end
 
-    def request_dirs(info_request)
-        first_three_digits = info_request.id.to_s()[0..2]
-        File.join(first_three_digits.to_s, info_request.id.to_s)
-    end
-
-    def request_download_zip_dir(info_request)
-        File.join(download_zip_dir, "download", request_dirs(info_request))
-    end
-
-    def download_zip_dir()
-        File.join(Rails.root, '/cache/zips/')
-    end
-
     # get the local locale
     def locale_from_params(*args)
       if params[:show_locale]