diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2013-08-17 21:49:16 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2013-08-17 21:49:16 +0530 |
| commit | 9abe72c7600132aa964ca48c312ef981007ab8b1 (patch) | |
| tree | 6062ada5e442186cf949df4b9a1502e84bbb0271 /activerecord/test/models/movie.rb | |
| parent | d73232c9c8933b9f3092d5d27b7ffab6ccc0422c (diff) | |
| parent | ec8ef1e1055c4e1598da13f49d30261f07f4a9b4 (diff) | |
| download | rails-9abe72c7600132aa964ca48c312ef981007ab8b1.tar.gz rails-9abe72c7600132aa964ca48c312ef981007ab8b1.tar.bz2 rails-9abe72c7600132aa964ca48c312ef981007ab8b1.zip | |
Merge branch 'master' of github.com:rails/docrails
Conflicts:
actionview/README.rdoc
activerecord/lib/active_record/migration.rb
guides/source/development_dependencies_install.md
guides/source/getting_started.md
Diffstat (limited to 'activerecord/test/models/movie.rb')
| -rw-r--r-- | activerecord/test/models/movie.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/test/models/movie.rb b/activerecord/test/models/movie.rb index c441be2bef..6384b4c801 100644 --- a/activerecord/test/models/movie.rb +++ b/activerecord/test/models/movie.rb @@ -1,3 +1,5 @@ class Movie < ActiveRecord::Base - self.primary_key = "movieid" + def self.primary_key + "movieid" + end end |