Merge branch 'clean2'

Conflicts:
	app/controllers/tournaments_controller.rb
	app/views/tournaments/_form.html.erb
	app/views/tournaments/index.html.erb
	app/views/tournaments/show.html.erb

1 files changed, 15 insertions, 0 deletions

diff --git a/db/migrate/20140428092839_create_simple_captcha_data.rb b/db/migrate/20140428092839_create_simple_captcha_data.rb
new file mode 100644
index 0000000..4573b20
--- /dev/null
+++ b/db/migrate/20140428092839_create_simple_captcha_data.rb
@@ -0,0 +1,15 @@
+class CreateSimpleCaptchaData < ActiveRecord::Migration
+  def self.up
+    create_table :simple_captcha_data do |t|
+      t.string :key, :limit => 40
+      t.string :value, :limit => 6
+      t.timestamps
+    end
+    
+    add_index :simple_captcha_data, :key, :name => "idx_key"
+  end
+
+  def self.down
+    drop_table :simple_captcha_data
+  end
+end