Download as
Browse Code »

Commit 5baa5fad0a1c6e2b8790f07f62c088fd505406d9

Authored by gitlabhq
1 parent 61e6751e
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Issue #149

Showing 8 changed files with 18 additions and 14 deletions   Show diff stats
app/helpers/commits_helper.rb
  Diff comments   View file @5baa5fa
... ... @@ -21,13 +21,4 @@ module CommitsHelper
21 21 link_to "More", project_commits_path(@project, :offset => offset.to_i + limit.to_i, :limit => limit),
22 22 :remote => true, :class => "lite_button vm", :style => "text-align:center; width:930px; ", :id => "more-commits-link"
23 23 end
24   -
25   - # Cause some errors with trucate & encoding use this method
26   - def truncate_commit_message(commit, size = 60)
27   - message = commit.message
28   - message.length > size ? (message[0..(size - 1)] + "...") : message
29   - # if special characters occurs
30   - rescue
31   - commit.message
32   - end
33 24 end
... ...
app/views/commits/_commits.html.haml
  Diff comments   View file @5baa5fa
... ... @@ -11,7 +11,7 @@
11 11 = image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
12 12 %p
13 13 %strong
14   - = truncate_commit_message(commit)
  14 + = commit.truncated_message
15 15 = link_to "Browse Code", tree_project_path(@project, :commit_id => commit.id), :class => "lite_button", :style => "float:right"
16 16 = link_to truncate(commit.id.to_s, :length => 16), project_commit_path(@project, :id => commit.id), :class => "lite_button", :style => "width:120px;float:right"
17 17 %span
... ...
app/views/commits/show.html.haml
  Diff comments   View file @5baa5fa
1 1 %h3
2   - = "[ #{@commit.committer} ] #{truncate_commit_message(@commit, 80)}"
  2 + = "[ #{@commit.committer} ] #{@commit.truncated_message(40)}"
3 3 -#= link_to 'Back', project_commits_path(@project), :class => "button"
4 4 %table.round-borders
5 5 %tr
... ...
app/views/projects/_recent_commits.html.haml
  Diff comments   View file @5baa5fa
... ... @@ -6,7 +6,7 @@
6 6 = image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
7 7 %p{:style => "margin-bottom: 3px;"}
8 8 %strong
9   - = link_to truncate_commit_message(commit, 60), project_commit_path(@project, :id => commit.id)
  9 + = link_to commit.truncated_message(60), project_commit_path(@project, :id => commit.id)
10 10  
11 11 %span
12 12 %span.author
... ...
app/views/projects/_recent_messages.html.haml
  Diff comments   View file @5baa5fa
... ... @@ -19,7 +19,7 @@
19 19 - css_class = "dash_commit"
20 20 - commit = parent
21 21 - item_code = commit.author.email
22   - - link_item_name = truncate_commit_message(commit, 50)
  22 + - link_item_name = commit.truncated_message(50)
23 23 - link_to_item = project_commit_path(@project, :id => commit.id)
24 24 - else
25 25 - css_class = "dash_wall"
... ...
app/views/projects/_tree_item.html.haml
  Diff comments   View file @5baa5fa
... ... @@ -12,4 +12,4 @@
12 12 = time_ago_in_words(content_commit.committed_date)
13 13 ago
14 14 %td
15   - = link_to truncate_commit_message(content_commit, 40), project_commit_path(@project, content_commit)
  15 + = link_to content_commit.truncated_message(40), project_commit_path(@project, content_commit)
... ...
config/initializers/grit_ext.rb
  Diff comments   View file @5baa5fa
... ... @@ -6,3 +6,7 @@ Grit::Blob.class_eval do
6 6 include Utils::FileHelper
7 7 include Utils::Colorize
8 8 end
  9 +
  10 +Grit::Commit.class_eval do
  11 + include CommitExt
  12 +end
... ...
lib/commit_ext.rb 0 → 100644
  Diff comments   View file @5baa5fa
... ... @@ -0,0 +1,9 @@
  1 +module CommitExt
  2 + # Cause of encoding rails truncate raise error
  3 + # this method is temporary decision
  4 + def truncated_message(size = 80)
  5 + message.length > size ? (message[0..(size - 1)] + "...") : message
  6 + rescue
  7 + "-- invalid encoding for commit message"
  8 + end
  9 +end
... ...