From: Tom Hughes <tom@compton.nu>
Date: Sun, 16 May 2010 11:11:01 +0000 (+0100)
Subject: Merge branch 'master' into openid
X-Git-Tag: live~6320
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/996e60614d9d5a2e43b0ca246d9786d569fb7be2?hp=30693acc875e73972150146eb58afa17ea6db657

Merge branch 'master' into openid
---

diff --git a/db/migrate/049_improve_changeset_user_index.rb b/db/migrate/049_improve_changeset_user_index.rb
index af5d1a2ac..f02a63dcb 100644
--- a/db/migrate/049_improve_changeset_user_index.rb
+++ b/db/migrate/049_improve_changeset_user_index.rb
@@ -6,6 +6,6 @@ class ImproveChangesetUserIndex < ActiveRecord::Migration
 
   def self.down
     add_index :changesets, [:user_id], :name => "changesets_user_id_idx"
-    remove_index :changesets, [:user_id, :id], :name => "changesets_user_id_id_idx"
+    remove_index :changesets, :name => "changesets_user_id_id_idx"
   end
 end
diff --git a/db/migrate/20100513171259_add_user_date_index_to_changeset.rb b/db/migrate/20100513171259_add_user_date_index_to_changeset.rb
index 22e1f08fb..f1d7f43e8 100644
--- a/db/migrate/20100513171259_add_user_date_index_to_changeset.rb
+++ b/db/migrate/20100513171259_add_user_date_index_to_changeset.rb
@@ -4,6 +4,6 @@ class AddUserDateIndexToChangeset < ActiveRecord::Migration
   end
 
   def self.down
-    remove_index :changesets, [:user_id, :created_at], :name => "changesets_user_id_created_at_idx"
+    remove_index :changesets, :name => "changesets_user_id_created_at_idx"
   end
 end