aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--db/migrate/019_create_rejection_reasons.rb10
-rw-r--r--db/migrate/021_remove_contains_information_default.rb7
-rw-r--r--public/.htaccess5
3 files changed, 10 insertions, 12 deletions
diff --git a/db/migrate/019_create_rejection_reasons.rb b/db/migrate/019_create_rejection_reasons.rb
deleted file mode 100644
index a1c8a4c89..000000000
--- a/db/migrate/019_create_rejection_reasons.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class CreateRejectionReasons < ActiveRecord::Migration
- def self.up
- create_table :rejection_reasons do |t|
- end
- end
-
- def self.down
- drop_table :rejection_reasons
- end
-end
diff --git a/db/migrate/021_remove_contains_information_default.rb b/db/migrate/021_remove_contains_information_default.rb
index a27b53193..9969cbc2c 100644
--- a/db/migrate/021_remove_contains_information_default.rb
+++ b/db/migrate/021_remove_contains_information_default.rb
@@ -1,9 +1,16 @@
class RemoveContainsInformationDefault < ActiveRecord::Migration
def self.up
change_column :incoming_messages, :contains_information, :boolean, :default => nil
+ drop_table :rejection_reasons
end
def self.down
change_column :incoming_messages, :contains_information, :boolean, :default => false
+ create_table :rejection_reasons do |t|
+ t.column :incoming_message_id, :integer
+ t.column :reason, :string
+ t.column :created_at, :datetime
+ t.column :updated_at, :datetime
+ end
end
end
diff --git a/public/.htaccess b/public/.htaccess
index d3c998345..8c381e930 100644
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -2,6 +2,7 @@
AddHandler fastcgi-script .fcgi
AddHandler cgi-script .cgi
Options +FollowSymLinks +ExecCGI
+DirectoryIndex dispatch.fcgi
# If you don't want Rails to look in certain directories,
# use the following rewrite rules so that Apache won't rewrite certain requests
@@ -29,7 +30,7 @@ RewriteEngine On
RewriteRule ^$ index.html [QSA]
RewriteRule ^([^.]+)$ $1.html [QSA]
RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^(.*)$ dispatch.cgi [QSA,L]
+RewriteRule ^(.*)$ dispatch.fcgi [QSA,L]
# In case Rails experiences terminal errors
# Instead of displaying this message you can supply a file here which will be rendered instead
@@ -37,4 +38,4 @@ RewriteRule ^(.*)$ dispatch.cgi [QSA,L]
# Example:
# ErrorDocument 500 /500.html
-ErrorDocument 500 "<h2>Application error</h2>Rails application failed to start properly" \ No newline at end of file
+ErrorDocument 500 "<h2>Application error</h2>Rails application failed to start properly"