jro_apps/redmine Commit - r11448:4b5fa08f66a0

Merged r11671, r11672 and r11674 from trunk to 2.3-stable (#13405)...

Toshi MARUYAMA -

r11448:4b5fa08f66a0

parent child

Context file:

r11448:4b5fa08f66a0

Collapse all files

app/helpers/application_helper.rb +1 -1

                             if repository && (changeset = Changeset.visible.where("repository_id = ? AND scmid LIKE ?", repository.id, "#{name}%").first)
                               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},
                                                            :class => 'changeset',
-                                                           :title => truncate_single_line(h(changeset.comments), :length => 100)
+                                                           :title => truncate_single_line(changeset.comments, :length => 100)
                             end
                           else
                             if repository && User.current.allowed_to?(:browse_repository, project)

test/fixtures/changesets.yml +2 -1

               commit_date: 2007-04-11
               committed_on: 2007-04-11 15:14:44 +02:00
               revision: 1
+              scmid: 691322a8eb01e11fd7
               id: 100
-              comments: My very first commit
+              comments: 'My very first commit do not escaping #<>&'
               repository_id: 10
               committer: dlopper
               user_id: 3

test/unit/helpers/application_helper_test.rb +12 -7

                 note_link = link_to('#3', {:controller => 'issues', :action => 'show', :id => 3, :anchor => 'note-14'},
                                            :class => Issue.find(3).css_classes, :title => 'Error 281 when updating a recipe (New)')
-                changeset_link = link_to('r1', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :rev => 1},
+                revision_link = link_to('r1', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :rev => 1},
-                                               :class => 'changeset', :title => 'My very first commit')
+                                               :class => 'changeset', :title => 'My very first commit do not escaping #<>&')
-                changeset_link2 = link_to('r2', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :rev => 2},
+                revision_link2 = link_to('r2', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :rev => 2},
                                                 :class => 'changeset', :title => 'This commit fixes #1, #2 and references #1 & #3')
+                changeset_link2 = link_to('691322a8eb01e11fd7',
+                                          {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :rev => 1},
+                                           :class => 'changeset', :title => 'My very first commit do not escaping #<>&')
                 document_link = link_to('Test document', {:controller => 'documents', :action => 'show', :id => 1},
                                                          :class => 'document')
                   # should not ignore leading zero
                   '#03'                         => '#03',
                   # changesets
-                  'r1'                          => changeset_link,
+                  'r1'                          => revision_link,
-                  'r1.'                         => "#{changeset_link}.",
+                  'r1.'                         => "#{revision_link}.",
-                  'r1, r2'                      => "#{changeset_link}, #{changeset_link2}",
+                  'r1, r2'                      => "#{revision_link}, #{revision_link2}",
-                  'r1,r2'                       => "#{changeset_link},#{changeset_link2}",
+                  'r1,r2'                       => "#{revision_link},#{revision_link2}",
+                  'commit:691322a8eb01e11fd7'   => changeset_link2,
                   # documents
                   'document#1'                  => document_link,
                   'document:"Test document"'    => document_link,

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages