Merge branch 'joshsusser-master' into merge

* joshsusser-master:
  style cleanup
  Add migration history to schema.rb dump
  Add metadata to schema_migrations

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/schema.rb

1 files changed, 18 insertions, 0 deletions

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index e9f652b90e..57612bd3b8 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,5 +1,23 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   Add migration history to schema.rb dump.
+    Loading schema.rb with full migration history
+    restores the exact list of migrations that created
+    that schema (including names and fingerprints). This
+    avoids possible mistakes caused by assuming all
+    migrations with a lower version have been run when
+    loading schema.rb. Old schema.rb files without migration
+    history but with the :version setting still work as before.
+
+    *Josh Susser*
+
+*   Add metadata columns to schema_migrations table.
+    New columns are: migrated_at (timestamp),
+    fingerprint (md5 hash of migration source), and
+    name (filename minus version and extension)
+    
+    *Josh Susser*
+
 *   Fix performance problem with primary_key method in PostgreSQL adapter when having many schemas.
     Uses pg_constraint table instead of pg_depend table which has many records in general.
     Fix #8414