Merge branch 'master' into openstreetbugs2

db/migrate/20101114011429_add_editor_preference_to_user.rb

@@ -0,0 +1,9 @@
+class AddEditorPreferenceToUser < ActiveRecord::Migration
+  def self.up
+    add_column :users, :preferred_editor, :string
+  end
+
+  def self.down
+    remove_column :users, :preferred_editor
+  end
+end

db/migrate/20110322001319_add_terms_seen_to_user.rb

@@ -0,0 +1,13 @@
+class AddTermsSeenToUser < ActiveRecord::Migration
+  def self.up
+    add_column :users, :terms_seen, :boolean, :null => false, :default => false
+    
+    # best guess available is just that everyone who has agreed has
+    # seen the terms, and that noone else has.
+    User.update_all "terms_seen = (terms_agreed is not null)"
+  end
+
+  def self.down
+    remove_column :users, :terms_seen
+  end
+end