From d74f0bfd5c53962e332c2dd4d30dafaa1105b92b Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 23 Jul 2017 11:26:04 +0000 Subject: Merged rails-5.1 branch (#23630). git-svn-id: http://svn.redmine.org/redmine/trunk@16859 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- db/migrate/001_setup.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'db/migrate/001_setup.rb') 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 -- cgit v1.2.3