summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-05-22 14:57:04 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-05-22 14:57:04 +0300
commitcc8369144db2147d2956e8dd7d314e9a7dfd4fbb (patch)
tree666a442e00689911169e8cc336c5ce60d014854c
parent1b2068eaa91e5002d01a220c65da21dad8ccb071 (diff)
downloadgitlab-ce-cc8369144db2147d2956e8dd7d314e9a7dfd4fbb.tar.gz
Prevent app crash in case if encoding failedv2.5.0
-rw-r--r--lib/gitlabhq/encode.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlabhq/encode.rb b/lib/gitlabhq/encode.rb
index 55e86192ad4..df40206d5eb 100644
--- a/lib/gitlabhq/encode.rb
+++ b/lib/gitlabhq/encode.rb
@@ -11,6 +11,10 @@ module Gitlabhq
else
message
end.force_encoding("utf-8")
+ # Prevent app from crash cause of
+ # encoding errors
+ rescue
+ ""
end
end
end