Fix migration and use Rails 4.2.0 release (#14534).

git-svn-id: http://svn.redmine.org/redmine/trunk@13894 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/Gemfile b/Gemfile
index aa7d167352384f0df6040437a394c9c3cc848b5c..2991b004a3a49818ef5332afb65bb418b6eca2bc 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
 
-# gem "rails", "4.2.0"
-gem "rails", :git => "git://github.com/rails/rails.git", :branch => "4-2-stable"
+gem "rails", "4.2.0"
 gem "jquery-rails", "~> 3.1.1"
 gem "coderay", "~> 1.1.0"
 gem "builder", ">= 3.0.4"

diff --git a/db/migrate/20091114105931_add_view_issues_permission.rb b/db/migrate/20091114105931_add_view_issues_permission.rb
index d12b2deed8dffca752e08939a517d956e8fb52b2..6f700cd0c55b8c6487bbc97986ddd7cb574f359d 100644 (file)
--- a/db/migrate/20091114105931_add_view_issues_permission.rb
+++ b/db/migrate/20091114105931_add_view_issues_permission.rb
@@ -1,11 +1,13 @@
 class AddViewIssuesPermission < ActiveRecord::Migration
   def self.up
+    Role.reset_column_information
     Role.all.each do |r|
       r.add_permission!(:view_issues)
     end
   end
 
   def self.down
+    Role.reset_column_information
     Role.all.each do |r|
       r.remove_permission!(:view_issues)
     end