fix #132

gitlabhq
1 parent bcf55312
Showing 1 changed file with 4 additions and 2 deletions Show diff stats
app/helpers/commits_helper.rb
@@ -22,10 +22,12 @@ module CommitsHelper
       :remote => true, :class => "lite_button vm", :style => "text-align:center; width:930px; ", :id => "more-commits-link"
   end
  
+  # Cause some errors with trucate & encoding use this method
   def truncate_commit_message(commit, size = 60)
-    truncate(commit.message, :length => size)
+    message = commit.message
+    message.length > size ? (message[0..(size - 1)] + "...") : message
   # if special characters occurs
   rescue
-    commit.message.length > size ? (commit.message[0..(size - 1)] + "...") : commit.message
+    commit.message
   end
 end
...	...	@@ -22,10 +22,12 @@ module CommitsHelper
22	22	:remote => true, :class => "lite_button vm", :style => "text-align:center; width:930px; ", :id => "more-commits-link"
23	23	end
24	24
	25	+ # Cause some errors with trucate & encoding use this method
25	26	def truncate_commit_message(commit, size = 60)
26		- truncate(commit.message, :length => size)
	27	+ message = commit.message
	28	+ message.length > size ? (message[0..(size - 1)] + "...") : message
27	29	# if special characters occurs
28	30	rescue
29		- commit.message.length > size ? (commit.message[0..(size - 1)] + "...") : commit.message
	31	+ commit.message
30	32	end
31	33	end
...	...