[DRE-commits] [SCM] redmine.git branch, master-experimental, updated. debian/1.4.4+dfsg1-1-35-g042f641

[Ondřej Surý]

The following commit has been merged in the master-experimental branch:
commit f3289fd6d30b911239853563766493704842c42d
Author: Ondřej Surý <ondrej at sury.org>
Date:   Sun Oct 14 20:42:20 2012 +0200

    Update force mysql table encoding patch to Redmine 2.1

diff --git a/debian/patches/2008_force_table_encoding_mysql.patch b/debian/patches/2008_force_table_encoding_mysql.patch
index ce00fe2..b21dda7 100644
--- a/debian/patches/2008_force_table_encoding_mysql.patch
+++ b/debian/patches/2008_force_table_encoding_mysql.patch
@@ -9,11 +9,10 @@ Bug-Rails: http://rails.lighthouseapp.com/projects/8994/tickets/5830
 Last-Update: 2010-10-17
 --- a/config/initializers/10-patches.rb
 +++ b/config/initializers/10-patches.rb
-@@ -5,6 +5,22 @@
- 
+@@ -1,4 +1,19 @@
  require 'active_record'
- 
 +require 'active_record/connection_adapters/abstract_adapter'
++
 +module ActiveRecord
 +  module ConnectionAdapters
 +    class MysqlAdapter < AbstractAdapter
@@ -27,8 +26,6 @@ Last-Update: 2010-10-17
 +    end
 +  end
 +end
-+
-+
+ 
  module ActiveRecord
    class Base
-     include Redmine::I18n

-- 
redmine.git