diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
| commit | 2d1866d966d94c688f9cb87c5bf3f096dffac844 (patch) | |
| tree | 7a733c1cc51448ab69b3f892285305dbfb0ae15e /db/migrate/001_setup.rb | |
| parent | a6ec78a4dc658e3517ed682792016b6530458696 (diff) | |
| download | redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.tar.gz redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.zip | |
Merged rails-4.1 branch (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'db/migrate/001_setup.rb')
| -rw-r--r-- | db/migrate/001_setup.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/db/migrate/001_setup.rb b/db/migrate/001_setup.rb index f1b9c1ed4..3cea13591 100644 --- a/db/migrate/001_setup.rb +++ b/db/migrate/001_setup.rb @@ -17,7 +17,10 @@ class Setup < ActiveRecord::Migration - class User < ActiveRecord::Base; end + class User < ActiveRecord::Base + attr_protected :id + end + # model removed class Permission < ActiveRecord::Base; end |