Merge branch 'feature/batch-requests' into rails-3-develop

Conflicts:
    config/general.yml-example
    spec/factories.rb

1 files changed, 6 insertions, 0 deletions

diff --git a/spec/factories.rb b/spec/factories.rb
index 8b724ae37..8efc53033 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -123,6 +123,7 @@ FactoryGirl.define do
         salt "-6116981980.392287733335677"
         hashed_password '6b7cd45a5f35fd83febc0452a799530398bfb6e8' # jonespassword
         email_confirmed true
+        ban_text ""
         factory :admin_user do
             name 'Admin User'
             admin_level 'super'
@@ -156,4 +157,9 @@ FactoryGirl.define do
             public_body
         end
     end
+    factory :info_request_batch do
+        title "Example title"
+        user
+        body "Some text"
+    end
 end