Merge branch 'master' into openstreetbugs

Conflicts:
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
	config/initializers/mime_types.rb
	config/routes.rb
	lib/map_boundary.rb
	lib/migrate.rb
	lib/osm.rb
	vendor/assets/openlayers/OpenLayers.js

db/migrate/008_remove_segments.rb

@@ -82,6 +82,6 @@ class RemoveSegments < ActiveRecord::Migration
   end
 
   def self.down
-    raise IrreversibleMigration.new
+    raise ActiveRecord::IrreversibleMigration
   end
 end

db/migrate/020_populate_node_tags_and_remove.rb

@@ -55,7 +55,7 @@ class PopulateNodeTagsAndRemove < ActiveRecord::Migration
   end
 
   def self.down
-    raise IrreversibleMigration.new
+    raise ActiveRecord::IrreversibleMigration
 #    add_column :nodes, "tags", :text, :default => "", :null => false
 #    add_column :current_nodes, "tags", :text, :default => "", :null => false
   end

db/migrate/021_move_to_innodb.rb

@@ -16,7 +16,7 @@ class MoveToInnodb < ActiveRecord::Migration
     }
 
     @@conv_tables.each { |tbl|
-      change_engine (tbl, "InnoDB")
+      change_engine tbl, "InnoDB"
     }
 
     @@ver_tbl.each { |tbl|
@@ -42,6 +42,6 @@ class MoveToInnodb < ActiveRecord::Migration
   end
 
   def self.down
-    raise IrreversibleMigration.new
+    raise ActiveRecord::IrreversibleMigration
   end
 end

db/migrate/022_key_constraints.rb

@@ -47,6 +47,6 @@ class KeyConstraints < ActiveRecord::Migration
   end
 
   def self.down
-    raise IrreversibleMigration.new
+    raise ActiveRecord::IrreversibleMigration
   end
 end

db/migrate/023_add_changesets.rb

@@ -41,7 +41,7 @@ class AddChangesets < ActiveRecord::Migration
 
   def self.down
     # It's not easy to generate the user ids from the changesets
-    raise IrreversibleMigration.new
+    raise ActiveRecord::IrreversibleMigration
     #drop_table "changesets"
     #drop_table "changeset_tags"
   end

db/migrate/029_add_user_foreign_keys.rb

@@ -15,6 +15,6 @@ class AddUserForeignKeys < ActiveRecord::Migration
   end
 
   def self.down
-    raise IrreversibleMigration.new
+    raise ActiveRecord::IrreversibleMigration
   end
 end

db/migrate/030_add_foreign_keys.rb

@@ -9,6 +9,6 @@ class AddForeignKeys < ActiveRecord::Migration
   end
 
   def self.down
-    raise IrreversibleMigration.new
+    raise ActiveRecord::IrreversibleMigration
   end
 end

db/migrate/034_create_languages.rb

@@ -10,13 +10,13 @@ class CreateLanguages < ActiveRecord::Migration
 
     add_primary_key :languages, [:code]
 
-    Language.load(RAILS_ROOT + "/config/languages.yml")
+    Language.load("#{Rails.root}/config/languages.yml")
 
     add_foreign_key :users, [:locale], :languages, [:code]
     add_foreign_key :diary_entries, [:language_code], :languages, [:code]    
   end
 
   def self.down
-    raise IrreversibleMigration.new
+    raise ActiveRecord::IrreversibleMigration
   end
 end

db/migrate/20110925112722_rename_ids.rb

@@ -0,0 +1,18 @@
+class RenameIds < ActiveRecord::Migration
+  def change
+    rename_column :changeset_tags, :id, :changeset_id
+    rename_column :current_node_tags, :id, :node_id
+    rename_column :nodes, :id, :node_id
+    rename_column :node_tags, :id, :node_id
+    rename_column :current_way_tags, :id, :way_id
+    rename_column :current_way_nodes, :id, :way_id
+    rename_column :ways, :id, :way_id
+    rename_column :way_tags, :id, :way_id
+    rename_column :way_nodes, :id, :way_id
+    rename_column :current_relation_tags, :id, :relation_id
+    rename_column :current_relation_members, :id, :relation_id
+    rename_column :relations, :id, :relation_id
+    rename_column :relation_tags, :id, :relation_id
+    rename_column :relation_members, :id, :relation_id
+  end
+end

db/migrate/20111116184519_update_oauth.rb

@@ -0,0 +1,11 @@
+class UpdateOauth < ActiveRecord::Migration
+  def up
+    add_column :oauth_tokens, :scope, :string
+    add_column :oauth_tokens, :valid_to, :timestamp
+  end
+
+  def down
+    remove_column :oauth_tokens, :valid_to
+    remove_column :oauth_tokens, :scope
+  end
+end

db/migrate/20111212183945_add_lowercase_user_indexes.rb

@@ -0,0 +1,13 @@
+require 'lib/migrate'
+
+class AddLowercaseUserIndexes < ActiveRecord::Migration
+  def up
+    add_index :users, :display_name, :lowercase => true, :name => "users_display_name_lower_idx"
+    add_index :users, :email, :lowercase => true, :name => "users_email_lower_idx"
+  end
+
+  def down
+    remove_index :users, :name => "users_email_lower_idx"
+    remove_index :users, :name => "users_display_name_lower_idx"
+  end
+end

db/seeds.rb

@@ -0,0 +1,7 @@
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
+#
+# Examples:
+#
+#   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
+#   Mayor.create(:name => 'Daley', :city => cities.first)