##// END OF EJS Templates
Merged r11671, r11672 and r11674 from trunk to 2.3-stable (#13405)...
Toshi MARUYAMA -
r11448:4b5fa08f66a0
parent child
Show More
@@ -758,7 +758,7 module ApplicationHelper
758 758 if repository && (changeset = Changeset.visible.where("repository_id = ? AND scmid LIKE ?", repository.id, "#{name}%").first)
759 759 link = link_to h("#{project_prefix}#{repo_prefix}#{name}"), {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :repository_id => repository.identifier_param, :rev => changeset.identifier},
760 760 :class => 'changeset',
761 :title => truncate_single_line(h(changeset.comments), :length => 100)
761 :title => truncate_single_line(changeset.comments, :length => 100)
762 762 end
763 763 else
764 764 if repository && User.current.allowed_to?(:browse_repository, project)
@@ -3,8 +3,9 changesets_001:
3 3 commit_date: 2007-04-11
4 4 committed_on: 2007-04-11 15:14:44 +02:00
5 5 revision: 1
6 scmid: 691322a8eb01e11fd7
6 7 id: 100
7 comments: My very first commit
8 comments: 'My very first commit do not escaping #<>&'
8 9 repository_id: 10
9 10 committer: dlopper
10 11 user_id: 3
@@ -264,11 +264,15 RAW
264 264 note_link = link_to('#3', {:controller => 'issues', :action => 'show', :id => 3, :anchor => 'note-14'},
265 265 :class => Issue.find(3).css_classes, :title => 'Error 281 when updating a recipe (New)')
266 266
267 changeset_link = link_to('r1', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :rev => 1},
268 :class => 'changeset', :title => 'My very first commit')
269 changeset_link2 = link_to('r2', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :rev => 2},
267 revision_link = link_to('r1', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :rev => 1},
268 :class => 'changeset', :title => 'My very first commit do not escaping #<>&')
269 revision_link2 = link_to('r2', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :rev => 2},
270 270 :class => 'changeset', :title => 'This commit fixes #1, #2 and references #1 & #3')
271 271
272 changeset_link2 = link_to('691322a8eb01e11fd7',
273 {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :rev => 1},
274 :class => 'changeset', :title => 'My very first commit do not escaping #<>&')
275
272 276 document_link = link_to('Test document', {:controller => 'documents', :action => 'show', :id => 1},
273 277 :class => 'document')
274 278
@@ -304,10 +308,11 RAW
304 308 # should not ignore leading zero
305 309 '#03' => '#03',
306 310 # changesets
307 'r1' => changeset_link,
308 'r1.' => "#{changeset_link}.",
309 'r1, r2' => "#{changeset_link}, #{changeset_link2}",
310 'r1,r2' => "#{changeset_link},#{changeset_link2}",
311 'r1' => revision_link,
312 'r1.' => "#{revision_link}.",
313 'r1, r2' => "#{revision_link}, #{revision_link2}",
314 'r1,r2' => "#{revision_link},#{revision_link2}",
315 'commit:691322a8eb01e11fd7' => changeset_link2,
311 316 # documents
312 317 'document#1' => document_link,
313 318 'document:"Test document"' => document_link,
General Comments 0
You need to be logged in to leave comments. Login now