aboutsummaryrefslogtreecommitdiff
path: root/www/redmine/files/patch-config-boot.rb
diff options
context:
space:
mode:
Diffstat (limited to 'www/redmine/files/patch-config-boot.rb')
-rw-r--r--www/redmine/files/patch-config-boot.rb15
1 files changed, 3 insertions, 12 deletions
diff --git a/www/redmine/files/patch-config-boot.rb b/www/redmine/files/patch-config-boot.rb
index 96d51fce7df4..1cb087ff283f 100644
--- a/www/redmine/files/patch-config-boot.rb
+++ b/www/redmine/files/patch-config-boot.rb
@@ -1,15 +1,6 @@
---- config/boot.rb.orig 2011-03-07 20:44:40.000000000 +0100
-+++ config/boot.rb 2011-03-17 21:15:51.000000000 +0100
-@@ -1,6 +1,8 @@
- # Don't change this file!
- # Configure your app in config/environment.rb and config/environments/*.rb
-
-+require 'thread'
-+
- RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
-
- module Rails
-@@ -110,13 +112,13 @@
+--- config/boot.rb.orig 2011-05-30 18:51:21.000000000 +0200
++++ config/boot.rb 2011-05-31 14:07:01.000000000 +0200
+@@ -110,13 +110,13 @@
# Loads i18n 0.4.2 before Rails loads any more recent gem
# 0.5.0 is not compatible with the old interpolation syntax
# Plugins will have to migrate to the new syntax for 1.2.0