Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Mar 24, 2013
  1. @docunext
  2. @rafaelfranca

    Merge pull request #8501 from charliesome/version-to-s

    rafaelfranca authored
    Add #to_s method to VERSION modules
Commits on Mar 21, 2013
  1. @charliesome
Commits on Mar 20, 2013
  1. @Intrepidd

    Tidying up some require : removing useless sort and homogenizing with…

    Intrepidd authored
    … the rest of the code the wat the includes are done
Commits on Mar 19, 2013
  1. @vipulnsward
Commits on Mar 18, 2013
  1. @tenderlove

    Merge branch 'master-sec'

    tenderlove authored
    * master-sec:
      fix protocol checking in sanitization [CVE-2013-1857]
      JDOM XXE Protection [CVE-2013-1856]
      fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855]
      stop calling to_sym when building arel nodes [CVE-2013-1854]
  2. @senny

    `TimeWithZone` raises `NoMethodError` in proper context.

    senny authored
    Closes #9772.
    
    `TimeWithZone` delegates everything to the wrapped `Time` object
    using `method_missing`. The result is that `NoMethodError` error
    will be raised in the context of `Time` which leads to a misleading
    debug output.
Commits on Mar 16, 2013
  1. @steveklabnik

    Revert "Merge pull request #8156 from fredwu/acronym_fix-master"

    steveklabnik authored
    This reverts commit 867dc17, reversing
    changes made to 9a421aa.
    
    This breaks anyone who's using ForceSSL: https://travis-ci.org/rails-api/rails-api/jobs/5556065
    
    Please see comments on #8156 for some discussion.
  2. @fredwu

    Fixed a bug where the inflector would replace camelCase strings and d…

    fredwu authored
    …isregarding specified acronyms, fixes #8015
  3. @benmmurphy @tenderlove

    JDOM XXE Protection [CVE-2013-1856]

    benmmurphy authored tenderlove committed
Commits on Mar 15, 2013
  1. @steveklabnik

    Revert "make new rails apps log to STDOUT"

    steveklabnik authored
    This reverts commit b7d9d6e.
    
    Per discussion with @jeremy and @rubys on Campfire.
  2. @hone

    make new rails apps log to STDOUT

    hone authored
Commits on Mar 12, 2013
  1. @tenderlove
  2. @tenderlove
  3. @carlosantoniodasilva
Commits on Mar 9, 2013
Commits on Mar 5, 2013
  1. @tmm1
Commits on Mar 4, 2013
  1. @tenderlove
Commits on Feb 26, 2013
  1. @chuckbjones

    Fix deletion of empty directories:

    chuckbjones authored
    1. When comparing the directory to delete against the top level
       cache_path, use File.realpath to make sure we aren't comparing two
       unequal strings that point to the same path. This occurs, for
       example, when cache_path has a trailing slash, which it does in the
       default Rails configuration. Since the input to
       delete_empty_directories never has a trailing slash, the comparison
       will never be true and the top level cache directory (and above) may
       be deleted. However…
    
    2. File.delete raises EPERM when trying to delete a directory, so no
       directories have ever been deleted. Changing the code to Dir.delete
       fixes that.
Commits on Feb 25, 2013
  1. @dhh

    Preparing for 4.0.0.beta1 release

    dhh authored
  2. @chris-baynes
  3. @guilleiguaran

    Revert "Simplify code in AS json encoder"

    guilleiguaran authored
    This reverts commit 046e27a.
    Check #8815 (comment) for
    details.
  4. @steveklabnik

    Merge pull request #8815 from bogdan/simplified-to-json-args

    steveklabnik authored
    AS JSON encoder: remove monkey patch of Array
Commits on Feb 24, 2013
  1. @stopdropandrew
  2. @fxn

    Revert "prevent minitest from printing a --seed run option"

    fxn authored
    Reason: on a second thought, minitest prints a seed as run option
    regardless of the test order, and it actually calls srand, so
    albeit it might be misleading I believe, it is the way it is and
    should be left that way.
    
    This reverts commit c15862a.
  3. @fxn

    prevent minitest from printing a --seed run option

    fxn authored
    See the first FIXME comment in the patch for the rationale.
Commits on Feb 22, 2013
  1. @steveklabnik

    Merge pull request #9347 from hoffm/number_to_human_bug

    steveklabnik authored
    Address edge case for number_to_human with units option.
  2. @eval
  3. @hoffm

    Address edge case for number_to_human with units option.

    hoffm authored
    ActiveSupport::NumberHelper#number_to_human now returns the number unaltered when
    the units hash does not contain the needed key, e.g. when the number provided is less
    than the largest key provided.
Commits on Feb 21, 2013
  1. @gaganawhad
Commits on Feb 18, 2013
  1. @amatsuda
Commits on Feb 15, 2013
  1. @vijaydev

    Merge branch 'master' of github.com:lifo/docrails

    vijaydev authored
    Conflicts:
    	guides/source/upgrading_ruby_on_rails.md
Commits on Feb 10, 2013
  1. @tricknotes

    Supress warning about method redifinition

    tricknotes authored
    In i18n gem, the following methods are defined.
    - `Hash#except`
    - `Hash#slice`
    
    But if there are defined already, i18n skips these definitions.
    So these definition by `active_support` are required before `require 'i18n'`.
  2. @carlosantoniodasilva

    Merge pull request #9238 from norman/unicode_62

    carlosantoniodasilva authored
    Update to latest Unicode data.
  3. @pixeltrix

    Merge pull request #8643 from tricknotes/remove-method-redefined-warning

    pixeltrix authored
    Remove method redefined warning
Something went wrong with that request. Please try again.