Project

General

Profile

Actions

Defect #11341

closed

Escaped link in conflict resolution form

Added by Nayuta Taga over 11 years ago. Updated over 11 years ago.

Status:
Closed
Priority:
Normal
Category:
Issues
Target version:
Start date:
Due date:
% Done:

0%

Estimated time:
Resolution:
Fixed
Affected version:

Description

The third choice of the conflict resolution page shows raw HTML.
It should be html_safe-ed.


Files

Actions #1

Updated by Nayuta Taga over 11 years ago

The bug can be reproduced in both trunk and tags/2.0.3 .

$ RAILS_ENV=production rake about
About your application's environment
Ruby version 1.9.3 (i386-freebsd7)
RubyGems version 1.8.24
Rack version 1.4
Rails version 3.2.6
Active Record version 3.2.6
Action Pack version 3.2.6
Active Resource version 3.2.6
Action Mailer version 3.2.6
Active Support version 3.2.6
Middleware Rack::Cache, ActionDispatch::Static, Rack::Lock, #<ActiveSupport::Cache::Strategy::LocalCache::Middleware:0x28f90f4c>, Rack::Runtime, Rack::MethodOverride, ActionDispatch::RequestId, Rails::Rack::Logger, ActionDispatch::ShowExceptions, ActionDispatch::DebugExceptions, ActionDispatch::RemoteIp, ActionDispatch::Callbacks, ActiveRecord::ConnectionAdapters::ConnectionManagement, ActiveRecord::QueryCache, ActionDispatch::Cookies, ActionDispatch::Session::CookieStore, ActionDispatch::Flash, ActionDispatch::ParamsParser, ActionDispatch::Head, Rack::ConditionalGet, Rack::ETag, ActionDispatch::BestStandardsSupport, OpenIdAuthentication
Application root (snip)
Environment production
Database adapter sqlite3
Database schema version 20120705074331

Actions #2

Updated by Jean-Philippe Lang over 11 years ago

  • Tracker changed from Patch to Defect
  • Subject changed from Conflict resolution text bug to Escaped link in conflict resolution form
  • Status changed from New to Resolved
  • Target version set to 2.0.4
  • Affected version (unused) set to 2.0.0
  • Resolution set to Fixed
  • Affected version set to 2.0.0

Committed with test in r9925, thanks for pointing this out.

Actions #3

Updated by Jean-Philippe Lang over 11 years ago

  • Status changed from Resolved to Closed

Merged.

Actions

Also available in: Atom PDF