aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/migrations
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-12-09 15:52:28 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-12-09 15:57:34 -0700
commitcff747d304f008c103a7ba92440400a9a0848bee (patch)
tree88e4ac162d9a90db715abecbbfbfe155c7756d6f /activerecord/test/migrations
parent3c2c1a46064684a1becc8ae7b6b7fe6eebf9651a (diff)
downloadrails-cff747d304f008c103a7ba92440400a9a0848bee.tar.gz
rails-cff747d304f008c103a7ba92440400a9a0848bee.tar.bz2
rails-cff747d304f008c103a7ba92440400a9a0848bee.zip
Move to the schema-migrations-metadata branch.
Pending work on graceful app upgrades. Revert "Merge pull request #8439 from joshsusser/fixes" This reverts commit ce8ac39338f86388e70356b3a470b3ea443802ae, reversing changes made to b0e7b6f67c984d4b1502e801781ed75fad681633. Revert "Merge pull request #8431 from joshsusser/schemadump" This reverts commit 036d3e1c2b65c4b8cbd23de2e20ad67b9b756182, reversing changes made to 0c692f4d121792117b6a71e5ed590a31c3b9d12e. Revert "Merge branch 'joshsusser-master' into merge" This reverts commit 0c692f4d121792117b6a71e5ed590a31c3b9d12e, reversing changes made to 2e299fca715b083a60222a85e48f9d3b8dd8ce93. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb activerecord/test/cases/schema_dumper_test.rb
Diffstat (limited to 'activerecord/test/migrations')
-rw-r--r--activerecord/test/migrations/always_safe/1001_always_safe.rb5
-rw-r--r--activerecord/test/migrations/always_safe/1002_still_safe.rb5
2 files changed, 0 insertions, 10 deletions
diff --git a/activerecord/test/migrations/always_safe/1001_always_safe.rb b/activerecord/test/migrations/always_safe/1001_always_safe.rb
deleted file mode 100644
index 454b972507..0000000000
--- a/activerecord/test/migrations/always_safe/1001_always_safe.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AlwaysSafe < ActiveRecord::Migration
- def change
- # do nothing to avoid side-effect conflicts from running multiple times
- end
-end
diff --git a/activerecord/test/migrations/always_safe/1002_still_safe.rb b/activerecord/test/migrations/always_safe/1002_still_safe.rb
deleted file mode 100644
index 7398ae27a2..0000000000
--- a/activerecord/test/migrations/always_safe/1002_still_safe.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class StillSafe < ActiveRecord::Migration
- def change
- # do nothing to avoid side-effect conflicts from running multiple times
- end
-end