1/ rspec'ed
2/ @commit.safe_message as an argument 3/ preserve in helper 4/ spaces around operators
This commit is contained in:
parent
5d9f2e7d15
commit
89a03a3453
3 changed files with 78 additions and 10 deletions
|
@ -20,26 +20,27 @@ module CommitsHelper
|
|||
def more_commits_link
|
||||
offset = params[:offset] || 0
|
||||
limit = params[:limit] || 100
|
||||
link_to "More", project_commits_path(@project, :offset => offset.to_i + limit.to_i, :limit => limit),
|
||||
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
|
||||
|
||||
def commit_msg_with_link_to_issues
|
||||
out = ""
|
||||
@commit.safe_message.split(/(#[0-9]+)/m).each do |m|
|
||||
def commit_msg_with_link_to_issues(project, message)
|
||||
return '' unless message
|
||||
out = ''
|
||||
message.split(/(#[0-9]+)/m).each do |m|
|
||||
if m =~ /(#([0-9]+))/m
|
||||
begin
|
||||
issue = Issue.find($2)
|
||||
raise Exception('Issue not belonging to current project, not creating link !') unless issue.project_id == @project.id
|
||||
out+=link_to($1, project_issue_path(@project, $2))
|
||||
raise Exception('Issue not belonging to current project, not creating link !') unless issue.project_id == project.id
|
||||
out += link_to($1, project_issue_path(project, $2))
|
||||
rescue
|
||||
out+=$1
|
||||
out += $1
|
||||
end
|
||||
else
|
||||
out+= m
|
||||
out += m
|
||||
end
|
||||
end
|
||||
out
|
||||
preserve out
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
%hr
|
||||
%pre.commit_message
|
||||
= preserve commit_msg_with_link_to_issues
|
||||
= commit_msg_with_link_to_issues(@project, @commit.safe_message)
|
||||
.clear
|
||||
%br
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue