Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ruby/rdoc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.12
Choose a base ref
...
head repository: ruby/rdoc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.12.2
Choose a head ref
  • 20 commits
  • 12 files changed
  • 1 contributor

Commits on Feb 5, 2013

  1. Fix CVE-2013-0256, an XSS exploit in darkfish.js

    This XSS exploit could lead to cookie disclosure on websites hosting
    generated RDoc content.  This commit includes a patch rdoc users may
    apply to their generated content in CVE-2013-0256.rdoc.
    drbrain committed Feb 5, 2013
    Copy the full SHA
    a7d6b41 View commit details
  2. Copy the full SHA
    adef57a View commit details
  3. Copy the full SHA
    09d00be View commit details

Commits on Feb 6, 2013

  1. Update History with correct CVE

    Add rdoc 3.9.5 to unaffected versions
    drbrain committed Feb 6, 2013
    Copy the full SHA
    2f35a52 View commit details
  2. Set release date

    drbrain committed Feb 6, 2013
    Copy the full SHA
    7132b32 View commit details
  3. Update version

    drbrain committed Feb 6, 2013
    Copy the full SHA
    04afc96 View commit details

Commits on Feb 24, 2013

  1. Fixed syntax highlighting of regular expressions

    In HTML output, syntax highlighting of regular expressions could become
    corrupted.  This patch whitelists "/" as a character with a matching
    terminal like '"' and "'" for strings.
    
    See also Ruby Bug #6488 and #6523
    
    Conflicts:
    	History.rdoc
    drbrain committed Feb 24, 2013
    Copy the full SHA
    c24963c View commit details
  2. Fixed Regexp backreference corruption

    Regular expression parsing was switched to use single-quote escaping
    rules.  Using double quote rules, extra backslashes and white spaces was
    added.
    
    See also Ruby Bug #6488 and #6523
    drbrain committed Feb 24, 2013
    Copy the full SHA
    6580451 View commit details
  3. Fixed lexing of character syntax like ?z

    Character syntax `?z` was lexed as an integer token `"zz"`.  This has
    been fixed to lex as a single character string `"z"`.  While this won't
    round-trip, it is acceptable for syntax highlighting.
    
    This was discovered by Xavier Noria (@fxn) in rails/rails#7172.
    
    Conflicts:
    	History.rdoc
    drbrain committed Feb 24, 2013
    Copy the full SHA
    26fc790 View commit details
  4. Copy the full SHA
    8eb2ae2 View commit details
  5. Fixed tokenization of "a%1"

    Updated failed tokenization examples to use bad octal digits
    
    Conflicts:
    	History.rdoc
    	test/test_rdoc_markup_to_html.rb
    	test/test_rdoc_markup_to_html_snippet.rb
    drbrain committed Feb 24, 2013
    Copy the full SHA
    976d31f View commit details
  6. Gave TkEND_OF_SCRIPT#text a value

    This allows __END__ to be shown in HTML verbatim blocks
    
    Conflicts:
    	History.rdoc
    drbrain committed Feb 24, 2013
    Copy the full SHA
    24efb01 View commit details
  7. Copy the full SHA
    5544853 View commit details
  8. Parse unicode characters above \uFFFF

    The regular expression matching identifiers was incomplete for unicode
    characters.  Now 𝖒 can be parsed in an identifier.
    
    Ruby Bug #7524
    drbrain committed Feb 24, 2013
    Copy the full SHA
    78ef23e View commit details
  9. Added limited HEREDOC tokenization

    A TkHEREDOC is only generated when the heredoc identifier is followed by
    a line end.  When followed by a method call, comma, etc. a TkSTRING is
    returned instead so the source output in the HTML view is correct.
    
    Fixes #162
    
    Conflicts:
    	History.rdoc
    	lib/rdoc/store.rb
    drbrain committed Feb 24, 2013
    Copy the full SHA
    a5fc3d6 View commit details
  10. Fixed tests broken by incompetent cherry-picking

    Since I didn't run tests during cherry pick I missed some merges.  These
    have no been corrected.
    drbrain committed Feb 24, 2013
    Copy the full SHA
    96c3d72 View commit details
  11. Set version to 3.12.2

    The parser changes to support %i were only bug fixes to master.
    
    As it happens, %i support is by accident and RDoc consideres this a
    method call to %.  This should probably be fixed in master at some point.
    drbrain committed Feb 24, 2013
    Copy the full SHA
    92c591c View commit details

Commits on Feb 25, 2013

  1. Copy the full SHA
    751f7ac View commit details
  2. Copy the full SHA
    13f339a View commit details
  3. Fix test in a cross-ruby way

    drbrain committed Feb 25, 2013
    Copy the full SHA
    e210ead View commit details
Loading