diff options
| author | Nihad Abbasov <narkoz.2008@gmail.com> | 2011-10-26 23:35:17 +0500 |
|---|---|---|
| committer | Nihad Abbasov <narkoz.2008@gmail.com> | 2011-10-26 23:35:17 +0500 |
| commit | f1e6d9be90c9f02ecbb334900e34f9a2a15c4530 (patch) | |
| tree | 8bd2a0de081fe6763f7738bb45433043e3dddcea /lib/commit_ext.rb | |
| parent | e0f4a37f3d9fba676c60d28677dfd1d7c9dfd5ac (diff) | |
| parent | f1e25f25635c64f1c994d01c90a8e50c8be1f81f (diff) | |
| download | gitlab-ce-f1e6d9be90c9f02ecbb334900e34f9a2a15c4530.tar.gz | |
Merge branch 'assets-refactoring' into dev
Conflicts:
app/controllers/issues_controller.rb
app/views/issues/index.html.haml
Diffstat (limited to 'lib/commit_ext.rb')
| -rw-r--r-- | lib/commit_ext.rb | 8 |
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 |