From 4c9326eaf956ff0e82eb4cce88a8d4d8ca88de5a Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Tue, 21 Aug 2012 15:42:07 -0700
Subject: [PATCH] fix stupid sign up form

---
 app/views/registrations/new.html.erb | 6 +++---
 db/schema.rb                         | 6 +-----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/views/registrations/new.html.erb b/app/views/registrations/new.html.erb
index 67af6f7bb..e6bcf2cf7 100644
--- a/app/views/registrations/new.html.erb
+++ b/app/views/registrations/new.html.erb
@@ -27,7 +27,7 @@
                     </label>
 
                     <div class="controls">
-                        <%= f.email_field :email, :validate => {:presence => true}, :placeholder => "luke@hoth.net", :title => t('registrations.new.enter_email'), :required => true %>
+                        <%= f.email_field :email, :placeholder => "luke@hoth.net", :title => t('registrations.new.enter_email'), :required => true %>
                     </div>
                   </div>
 
@@ -37,7 +37,7 @@
                       </label>
 
                       <div class="controls">
-                        <%= f.text_field :username, :validate => {:presence => true}, :placeholder => "jedi_guy", :title => t('registrations.new.enter_username'), :required => true, :pattern => "[A-Za-z0-9_]+" %>
+                        <%= f.text_field :username, :placeholder => "jedi_guy", :title => t('registrations.new.enter_username'), :required => true, :pattern => "[A-Za-z0-9_]+" %>
                       </div>
                   </div>
 
@@ -47,7 +47,7 @@
                     </label>
 
                     <div class="controls">
-                        <%= f.password_field :password, :validate => {:presence => true}, :placeholder => "••••••••", :title => t('registrations.new.enter_password'), :required => true, :pattern => "......+" %>
+                        <%= f.password_field :password, :placeholder => "••••••••", :title => t('registrations.new.enter_password'), :required => true, :pattern => "......+" %>
                     </div>
                   </div>
                   <%= invite_hidden_tag(invite) %>
diff --git a/db/schema.rb b/db/schema.rb
index a118c3e64..5c39e4392 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -107,8 +107,6 @@ ActiveRecord::Schema.define(:version => 20120803143552) do
     t.datetime "updated_at", :null => false
   end
 
-  add_index "conversations", ["author_id"], :name => "conversations_author_id_fk"
-
   create_table "invitation_codes", :force => true do |t|
     t.string   "token"
     t.integer  "user_id"
@@ -146,7 +144,6 @@ ActiveRecord::Schema.define(:version => 20120803143552) do
     t.string   "target_type",             :limit => 60,                   :null => false
   end
 
-  add_index "likes", ["author_id"], :name => "likes_author_id_fk"
   add_index "likes", ["guid"], :name => "index_likes_on_guid", :unique => true
   add_index "likes", ["target_id", "author_id", "target_type"], :name => "index_likes_on_target_id_and_author_id_and_target_type", :unique => true
   add_index "likes", ["target_id"], :name => "index_likes_on_post_id"
@@ -172,7 +169,6 @@ ActiveRecord::Schema.define(:version => 20120803143552) do
   end
 
   add_index "messages", ["author_id"], :name => "index_messages_on_author_id"
-  add_index "messages", ["conversation_id"], :name => "messages_conversation_id_fk"
 
   create_table "notification_actors", :force => true do |t|
     t.integer  "notification_id"
@@ -204,7 +200,7 @@ ActiveRecord::Schema.define(:version => 20120803143552) do
     t.text   "data",                 :null => false
   end
 
-  add_index "o_embed_caches", ["url"], :name => "index_o_embed_caches_on_url", :length => {"url"=>255}
+  add_index "o_embed_caches", ["url"], :name => "index_o_embed_caches_on_url"
 
   create_table "participations", :force => true do |t|
     t.string   "guid"