From: randx <dmitriy.zaporozhets@gmail.com>
Date: Sun, 27 May 2012 09:20:35 +0000 (+0300)
Subject: Merge branch 'fix_encoding' of https://github.com/brodock/gitlabhq into brodock-fix_e... 
X-Git-Tag: v2.6.0~89
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d72f8db08a46cd03879035932ece2b4295bb3948;p=wvm%2Fgitlab.git

Merge branch 'fix_encoding' of https://github.com/brodock/gitlabhq into brodock-fix_encoding

Conflicts:
	lib/gitlab/encode.rb
---

d72f8db08a46cd03879035932ece2b4295bb3948
diff --cc lib/gitlab/encode.rb
index a9660fa51,1a81accea..1c95a9477
--- a/lib/gitlab/encode.rb
+++ b/lib/gitlab/encode.rb
@@@ -1,4 -1,7 +1,6 @@@
+ # Patch Strings to enable detect_encoding! on views
+ require 'charlock_holmes/string'
 -
 -module Gitlabhq
 +module Gitlab
    module Encode 
      extend self