Merged rails-5.1 branch (#23630).

git-svn-id: http://svn.redmine.org/redmine/trunk@16859 e93f8b46-1217-0410-a6f0-8f06a7374b81
2025-10-26 07:46:17 +01:00 · 2017-07-23 11:26:04 +00:00
parent 41bb302594
commit d74f0bfd5c
381 changed files with 598 additions and 640 deletions
--- a/db/migrate/014_add_queries_permissions.rb
+++ b/db/migrate/014_add_queries_permissions.rb
@@ -1,4 +1,4 @@
-class AddQueriesPermissions < ActiveRecord::Migration
+class AddQueriesPermissions < ActiveRecord::Migration[4.2]
  # model removed
  class Permission < ActiveRecord::Base; end