diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-03-10 19:35:20 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-03-10 19:35:20 +0000 |
| commit | 582edaa1ffd6d875e18c50e36e144544209fd158 (patch) | |
| tree | ce4fb934973e1385ec64b78df6984e4a6267fc11 /activerecord | |
| parent | 2d3d9e3531d0d49a94ded10b993640053bd76c03 (diff) | |
| parent | 51a269b2282ec09cf58614e738a2d0e40d2909d3 (diff) | |
| download | rails-582edaa1ffd6d875e18c50e36e144544209fd158.tar.gz rails-582edaa1ffd6d875e18c50e36e144544209fd158.tar.bz2 rails-582edaa1ffd6d875e18c50e36e144544209fd158.zip | |
Merge branch 'master' into nested_has_many_through
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/README.rdoc | 2 | ||||
| -rw-r--r-- | activerecord/test/fixtures/tasks.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/README.rdoc b/activerecord/README.rdoc index 91a23da8ad..a27640eac9 100644 --- a/activerecord/README.rdoc +++ b/activerecord/README.rdoc @@ -203,7 +203,7 @@ The latest version of Active Record can be installed with Rubygems: Source code can be downloaded as part of the Rails project on GitHub -* http://github.com/rails/rails/tree/master/activerecord/ +* https://github.com/rails/rails/tree/master/activerecord/ == License diff --git a/activerecord/test/fixtures/tasks.yml b/activerecord/test/fixtures/tasks.yml index 1e6a061acc..01c95b3a4c 100644 --- a/activerecord/test/fixtures/tasks.yml +++ b/activerecord/test/fixtures/tasks.yml @@ -1,4 +1,4 @@ -# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html +# Read about fixtures at http://api.rubyonrails.org/classes/Fixtures.html first_task: id: 1 starting: 2005-03-30t06:30:00.00+01:00 |