Permalink
Commits on Apr 30, 2012
  1. Provide a more useful definition of json_escape

    The previous definition removed double quote characters,
    and hence returned invalid JSON, making it unsuitable
    for the most common use case: bootstrapping JSON in
    a <script> element.
    
    The original definition was at 0ff7a2d,
    without indication that the double quote behavior was intentional.
    It seems likely that it was simply an oversight after
    copy and pasting the definition of html_escape.
    
    Furthermore, since json_escape does not return a HTML-safe
    string if not passed one, it is unnecessary for it to escape
    characters other than the slash.
    committed Apr 30, 2012
  2. Merge pull request #6091 from twinturbo/add-ids

    Add ActiveRecord::Base#ids - Close #5812
    wycats committed Apr 30, 2012
  3. Add ActiveRecord::Base#ids

    twinturbo committed Apr 30, 2012
  4. Merge pull request #5175 from jasonnoble/rake_notes_directories

    Custom directories for rake notes
    jeremy committed Apr 30, 2012
  5. Remove empty lines.

    jasonnoble committed Apr 30, 2012
  6. Add documentation to command_line.textile explaining how to use addit…

    …ional notes directories
    jasonnoble committed Apr 30, 2012
  7. Add ability to specify custom annotation directories

    SOURCE_ANNOTATION_DIRECTORIES='dir1,dir2' bundle exec rake notes
    
       Searches app, config, lib, script, test (default)
       Also searches dir1, dir2
    
    References: #4536, #4540
    jasonnoble committed with jasonnoble Feb 25, 2012
  8. Add test coverage for rake notes

    Add separate tests to verify directories covered
    Add tests to verify file_types
    jasonnoble committed with jasonnoble Feb 25, 2012
  9. Merge pull request #5705 from lest/patch-3

    split CDATA end token in cdata_section helper
    jeremy committed Apr 30, 2012
  10. Merge pull request #6084 from brainopia/support_for_magic_domain_on_a…

    …ll_stores
    
    Support cookie jar options for all cookie stores
    josevalim committed Apr 30, 2012
  11. Merge pull request #6082 from brainopia/smarter_cookie_jar

    Stream cookies only if needed
    josevalim committed Apr 30, 2012
  12. Merge pull request #6083 from brainopia/remove_unused_closed_ivars

    Remove a couple of unused ivars left from previous refactoring
    josevalim committed Apr 30, 2012
  13. Merge pull request #3726 from JanDupal/fix-date-helper-hidden

    fix Helpers::DateHelper with :use_hidden - hide separators
    josevalim committed Apr 30, 2012
  14. Merge pull request #5838 from IamNaN/patch-1

    Incorporating Pacific Island zone changes circa Dec 31 2011
    pixeltrix committed Apr 30, 2012
  15. Merge pull request #6080 from carlosantoniodasilva/as-changelog-update

    Improve changelog of new :silence deprecation behavior
    fxn committed Apr 30, 2012
  16. Merge pull request #6079 from arunagw/build_fix_master_observing_test

    build fix for observing_test.rb
    josevalim committed Apr 30, 2012
  17. build fix for observing_test.rb

    introduced here 17c990b
    arunagw committed Apr 30, 2012
  18. Merge pull request #6077 from dmitriy-kiriyenko/improve_signature_of_…

    …time_in_words_helper
    
    Replace boolean argument with an options hash.
    josevalim committed Apr 30, 2012
  19. Merge pull request #5530 from malclocke/add_option_to_skip_index.html…

    …_on_rails_generate
    
    Added a generator option to skip the public/index.html file
    josevalim committed Apr 30, 2012
  20. Replace boolean argument with an options hash.

    This replaces `include_seconds` argument with an option key
    `include_seconds => true` in options hash.
    
    Also `time_ago_in_words` now passes options hash, including a `locale`
    key, which makes in compatible with `distance_of_time_in_words`.
    dmitriy-kiriyenko committed Apr 30, 2012
  21. Merge pull request #6078 from lest/patch-4

    allow send_file/send_data to skip disposition header, closes #2973
    josevalim committed Apr 30, 2012
  22. Failing test for #6034

    drogus committed Apr 30, 2012
  23. Merge pull request #6034 from willbryant/flash_must_not_load_session_…

    …on_every_request_master
    
    Fix the Flash middleware loading the session on every request
    drogus committed Apr 30, 2012
  24. Merge pull request #6072 from marcandre/observer_simplify_test

    Observer: simplify tests
    spastorino committed Apr 30, 2012
  25. no need to dup options in send_data

    options aren't modified inside send_file_headers!
    lest committed Apr 30, 2012
  26. Merge pull request #5177 from cap10morgan/fix-gh-issue-4374

    fix inflector bug where -ice gets singularized into -ouse
    josevalim committed Apr 30, 2012