summaryrefslogtreecommitdiff
path: root/lib/commit_ext.rb
diff options
context:
space:
mode:
authorDZ <dzaporozhets@sphereconsultinginc.com>2011-10-27 16:47:39 +0300
committerDZ <dzaporozhets@sphereconsultinginc.com>2011-10-27 16:47:39 +0300
commit84457708d8704f23de6a974a8dce0995ce0d03ea (patch)
tree33601d85a4169d8073a89b0d5ec6d35f929c6bdb /lib/commit_ext.rb
parentd64f23e29419c92c36a0f64917563336ed6012e3 (diff)
parentbd219fcc54adfd136ca7111c2f2bb00996297938 (diff)
downloadgitlab-ce-84457708d8704f23de6a974a8dce0995ce0d03ea.tar.gz
Merge branch 'dev' of dev.gitlabhq.com:gitlabhq into dev
Diffstat (limited to 'lib/commit_ext.rb')
-rw-r--r--lib/commit_ext.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/commit_ext.rb b/lib/commit_ext.rb
index e09dbdaf8ef..411809f05ed 100644
--- a/lib/commit_ext.rb
+++ b/lib/commit_ext.rb
@@ -1,11 +1,11 @@
module CommitExt
def safe_message
- message.encode("UTF-8",
- :invalid => :replace,
- :undef => :replace,
+ message.encode("UTF-8",
+ :invalid => :replace,
+ :undef => :replace,
:universal_newline => true,
:replace => "")
- rescue
+ rescue
"-- invalid encoding for commit message"
end
end