diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-07-23 11:26:04 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-07-23 11:26:04 +0000 |
| commit | d74f0bfd5c53962e332c2dd4d30dafaa1105b92b (patch) | |
| tree | f3eaf66d67c3a87fb34340561bf188d364de623c /db/migrate/001_setup.rb | |
| parent | 41bb302594b48152b87c92f196c915f499093bbf (diff) | |
| download | redmine-d74f0bfd5c53962e332c2dd4d30dafaa1105b92b.tar.gz redmine-d74f0bfd5c53962e332c2dd4d30dafaa1105b92b.zip | |
Merged rails-5.1 branch (#23630).
git-svn-id: http://svn.redmine.org/redmine/trunk@16859 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'db/migrate/001_setup.rb')
| -rw-r--r-- | db/migrate/001_setup.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/db/migrate/001_setup.rb b/db/migrate/001_setup.rb index 15d783c45..1cd569403 100644 --- a/db/migrate/001_setup.rb +++ b/db/migrate/001_setup.rb @@ -15,10 +15,9 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -class Setup < ActiveRecord::Migration +class Setup < ActiveRecord::Migration[4.2] class User < ActiveRecord::Base - attr_protected :id end # model removed |