aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2015-05-11 17:44:51 +0200
committerYves Senn <yves.senn@gmail.com>2015-05-11 17:44:51 +0200
commit7b235eb080372ecbec0113366e749545582fdd3a (patch)
treeb5595af39aee32ab0e9b67ed7860f642e8ddcad1
parentdb0e649aba7135133154a35549219cffe968eaf6 (diff)
parent625404762a891c5dfbb5355eca3416b9592f7643 (diff)
downloadrails-7b235eb080372ecbec0113366e749545582fdd3a.tar.gz
rails-7b235eb080372ecbec0113366e749545582fdd3a.tar.bz2
rails-7b235eb080372ecbec0113366e749545582fdd3a.zip
Merge pull request #20105 from claudiob/rails31-is-out
[ci skip] Fix comment, since Rails 3.1 is out
-rw-r--r--2015_05_10_.dump0
-rw-r--r--activerecord/lib/active_record/migration.rb3
2 files changed, 1 insertions, 2 deletions
diff --git a/2015_05_10_.dump b/2015_05_10_.dump
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/2015_05_10_.dump
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index a83b90a95f..ef446ce596 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -307,9 +307,8 @@ module ActiveRecord
#
# == Reversible Migrations
#
- # Starting with Rails 3.1, you will be able to define reversible migrations.
# Reversible migrations are migrations that know how to go +down+ for you.
- # You simply supply the +up+ logic, and the Migration system will figure out
+ # You simply supply the +up+ logic, and the Migration system figures out
# how to execute the down commands for you.
#
# To define a reversible migration, define the +change+ method in your