This commit is contained in:
gitlabhq 2011-10-24 22:38:03 +03:00
parent 61e6751ea6
commit 5baa5fad0a
8 changed files with 18 additions and 14 deletions

View file

@ -21,13 +21,4 @@ module CommitsHelper
link_to "More", project_commits_path(@project, :offset => offset.to_i + limit.to_i, :limit => limit),
: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)
message = commit.message
message.length > size ? (message[0..(size - 1)] + "...") : message
# if special characters occurs
rescue
commit.message
end
end

View file

@ -11,7 +11,7 @@
= image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
%p
%strong
= truncate_commit_message(commit)
= commit.truncated_message
= link_to "Browse Code", tree_project_path(@project, :commit_id => commit.id), :class => "lite_button", :style => "float:right"
= link_to truncate(commit.id.to_s, :length => 16), project_commit_path(@project, :id => commit.id), :class => "lite_button", :style => "width:120px;float:right"
%span

View file

@ -1,5 +1,5 @@
%h3
= "[ #{@commit.committer} ] #{truncate_commit_message(@commit, 80)}"
= "[ #{@commit.committer} ] #{@commit.truncated_message(40)}"
-#= link_to 'Back', project_commits_path(@project), :class => "button"
%table.round-borders
%tr

View file

@ -6,7 +6,7 @@
= image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
%p{:style => "margin-bottom: 3px;"}
%strong
= link_to truncate_commit_message(commit, 60), project_commit_path(@project, :id => commit.id)
= link_to commit.truncated_message(60), project_commit_path(@project, :id => commit.id)
%span
%span.author

View file

@ -19,7 +19,7 @@
- css_class = "dash_commit"
- commit = parent
- item_code = commit.author.email
- link_item_name = truncate_commit_message(commit, 50)
- link_item_name = commit.truncated_message(50)
- link_to_item = project_commit_path(@project, :id => commit.id)
- else
- css_class = "dash_wall"

View file

@ -12,4 +12,4 @@
= time_ago_in_words(content_commit.committed_date)
ago
%td
= link_to truncate_commit_message(content_commit, 40), project_commit_path(@project, content_commit)
= link_to content_commit.truncated_message(40), project_commit_path(@project, content_commit)

View file

@ -6,3 +6,7 @@ Grit::Blob.class_eval do
include Utils::FileHelper
include Utils::Colorize
end
Grit::Commit.class_eval do
include CommitExt
end

9
lib/commit_ext.rb Normal file
View file

@ -0,0 +1,9 @@
module CommitExt
# Cause of encoding rails truncate raise error
# this method is temporary decision
def truncated_message(size = 80)
message.length > size ? (message[0..(size - 1)] + "...") : message
rescue
"-- invalid encoding for commit message"
end
end