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

4 files changed, 25 insertions, 0 deletions

diff --git a/db/migrate/20130731142632_remove_prominence_from_info_request_event.rb b/db/migrate/20130731142632_remove_prominence_from_info_request_event.rb
new file mode 100644
index 000000000..df0278c20
--- /dev/null
+++ b/db/migrate/20130731142632_remove_prominence_from_info_request_event.rb
@@ -0,0 +1,9 @@
+class RemoveProminenceFromInfoRequestEvent < ActiveRecord::Migration
+  def up
+      remove_column :info_request_events, :prominence
+  end
+
+  def down
+      add_column :info_request_events, :prominence, :string, :null => false, :default => 'normal'
+  end
+end
diff --git a/db/migrate/20130731145325_add_prominence_to_incoming_message.rb b/db/migrate/20130731145325_add_prominence_to_incoming_message.rb
new file mode 100644
index 000000000..01c4906a7
--- /dev/null
+++ b/db/migrate/20130731145325_add_prominence_to_incoming_message.rb
@@ -0,0 +1,5 @@
+class AddProminenceToIncomingMessage < ActiveRecord::Migration
+  def change
+      add_column :incoming_messages, :prominence, :string, :null => false, :default => 'normal'
+  end
+end
diff --git a/db/migrate/20130801154033_add_prominence_reason_to_incoming_message.rb b/db/migrate/20130801154033_add_prominence_reason_to_incoming_message.rb
new file mode 100644
index 000000000..2d189f658
--- /dev/null
+++ b/db/migrate/20130801154033_add_prominence_reason_to_incoming_message.rb
@@ -0,0 +1,5 @@
+class AddProminenceReasonToIncomingMessage < ActiveRecord::Migration
+  def change
+      add_column :incoming_messages, :prominence_reason, :text
+  end
+end
diff --git a/db/migrate/20130822161803_add_prominence_fields_to_outgoing_message.rb b/db/migrate/20130822161803_add_prominence_fields_to_outgoing_message.rb
new file mode 100644
index 000000000..a75e0d426
--- /dev/null
+++ b/db/migrate/20130822161803_add_prominence_fields_to_outgoing_message.rb
@@ -0,0 +1,6 @@
+class AddProminenceFieldsToOutgoingMessage < ActiveRecord::Migration
+  def change
+      add_column :outgoing_messages, :prominence, :string, :null => false, :default => 'normal'
+      add_column :outgoing_messages, :prominence_reason, :text
+  end
+end