Strip non utf8 content when displaying diff (ruby1.9 compatibility).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4604 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
1 parent
1c7079db3f
commit
488285e123
6 files changed
+65
-11
No files matched your search
Vendored
+14
-2
@@ -54,11 +54,11 @@ attachments_005:
|
||||
container_type: Issue
|
||||
container_id: 3
|
||||
downloads: 0
|
||||
disk_filename: 060719210727_changeset.diff
|
||||
disk_filename: 060719210727_changeset_iso8859-1.diff
|
||||
digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
|
||||
id: 5
|
||||
filesize: 687
|
||||
filename: changeset.diff
|
||||
filename: changeset_iso8859-1.diff
|
||||
author_id: 2
|
||||
content_type: text/x-diff
|
||||
attachments_006:
|
||||
@@ -157,3 +157,15 @@ attachments_013:
|
||||
filename: foo.zip
|
||||
author_id: 2
|
||||
content_type: application/octet-stream
|
||||
attachments_014:
|
||||
created_on: 2006-07-19 21:07:27 +02:00
|
||||
container_type: Issue
|
||||
container_id: 3
|
||||
downloads: 0
|
||||
disk_filename: 060719210727_changeset_utf8.diff
|
||||
digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
|
||||
id: 14
|
||||
filesize: 687
|
||||
filename: changeset_utf8.diff
|
||||
author_id: 2
|
||||
content_type: text/x-diff
|
||||
+3
-3
@@ -1,10 +1,10 @@
|
||||
Index: trunk/app/controllers/issues_controller.rb
|
||||
===================================================================
|
||||
--- trunk/app/controllers/issues_controller.rb (r‚vision 1483)
|
||||
+++ trunk/app/controllers/issues_controller.rb (r‚vision 1484)
|
||||
--- trunk/app/controllers/issues_controller.rb (révision 1483)
|
||||
+++ trunk/app/controllers/issues_controller.rb (révision 1484)
|
||||
@@ -149,7 +149,7 @@
|
||||
attach_files(@issue, params[:attachments])
|
||||
flash[:notice] = l(:notice_successful_create)
|
||||
flash[:notice] = 'Demande créée avec succès'
|
||||
Mailer.deliver_issue_add(@issue) if Setting.notified_events.include?('issue_added')
|
||||
- redirect_to :controller => 'issues', :action => 'show', :id => @issue, :project_id => @project
|
||||
+ redirect_to :controller => 'issues', :action => 'show', :id => @issue
|
||||
@@ -0,0 +1,13 @@
|
||||
Index: trunk/app/controllers/issues_controller.rb
|
||||
===================================================================
|
||||
--- trunk/app/controllers/issues_controller.rb (révision 1483)
|
||||
+++ trunk/app/controllers/issues_controller.rb (révision 1484)
|
||||
@@ -149,7 +149,7 @@
|
||||
attach_files(@issue, params[:attachments])
|
||||
flash[:notice] = 'Demande créée avec succès'
|
||||
Mailer.deliver_issue_add(@issue) if Setting.notified_events.include?('issue_added')
|
||||
- redirect_to :controller => 'issues', :action => 'show', :id => @issue, :project_id => @project
|
||||
+ redirect_to :controller => 'issues', :action => 'show', :id => @issue
|
||||
return
|
||||
end
|
||||
end
|
||||
Reference in new issue
Block a user