Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Nov 18, 2012
  1. @carlosantoniodasilva
  2. @carlosantoniodasilva

    Revert "Merge pull request #4575 from carlosantoniodasilva/remove-tes…

    carlosantoniodasilva authored
    …t-pending"
    
    This reverts commit 1620df7, reversing
    changes made to 2d00032.
    
    Conflicts:
    	activesupport/CHANGELOG.md
    	activesupport/lib/active_support/test_case.rb
Commits on Nov 17, 2012
  1. @zenspider
Commits on Nov 16, 2012
  1. @vijaydev

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

    vijaydev authored
    Conflicts:
    	actionpack/lib/action_dispatch/routing/redirection.rb
  2. @marcandre

    Simplify (and optimize)

    marcandre authored
  3. @marcandre
  4. @spastorino
  5. @spastorino
Commits on Nov 15, 2012
  1. @spastorino

    Merge pull request #8112 from rails/encrypted_cookies

    spastorino authored
    Encrypted cookies
  2. @maximerety
  3. @maximerety
  4. @rafaelfranca

    Merge pull request #8219 from nikitug/threadsafe_xmlmini_with_backend

    rafaelfranca authored
    Make XmlMini.with_backend usable with threads
    
    Conflicts:
    	activesupport/CHANGELOG.md
  5. @nikitug

    Make XmlMini.with_backend usable with threads

    nikitug authored
    `XmlMini.with_backend` now may be safely used with threads:
    
      Thread.new do
        XmlMini.with_backend("REXML") { rexml_power }
      end
      Thread.new do
        XmlMini.with_backend("LibXML") { libxml_power }
      end
    
    Each thread will use it's own backend.
  6. @fxn

    let remove_constant still delete Kernel#autoload constants [rounds #8213

    fxn authored
    ]
    
    The method #remove_const does not load the file, so we
    can still remove the constant.
  7. @fxn
Commits on Nov 13, 2012
  1. @tenderlove
  2. @carlosantoniodasilva

    Merge pull request #8180 from freerange/mocha-fixes-supporting-only-0…

    carlosantoniodasilva authored
    ….13-onwards
    
    Simplify code by taking advantage of latest mocha (v0.13.0).
Commits on Nov 12, 2012
  1. @senny

    `#as_json` isolates options when encoding a hash. Closes #8182

    senny authored
    Setting options in a custom `#as_json` method had side effects.
    Modifications of the `options` hash leaked outside and influenced
    the conversion of other objects contained in the hash.
  2. @floehopper

    Simplify code by taking advantage of latest mocha (v0.13.0).

    floehopper authored
    This only works with mocha v0.13.0 or later.
    
    Note that this also fixes a few subtle bugs present in the current
    implementation :-
    
    * Mocha was raising a `MiniTest::Assertion` instead of a
      `Mocha::ExpectationError` as intended. The latter is not recognized by
      MiniTest as an assertion failure and so it is recorded as a test
      *error*, not a test *failure* as it ought to. This leads to
      potentially confusing output in the test results.
    
    * Mocha verification should happen as part of the test. The verification
      of expectations is equivalent to a set of assertions. These assertions
      should happen as *part of* the test so that they have a chance to
      cause the test to fail, and not just as part of the teardown. Also if
      an assertion fails during the test, then there is no need to verify
      expectations, because only the first assertion failure is normally
      reported and all subsequent bets are off.
    
    * Expectation verification should be counted as an assertion. Mocha
      cannot record each expectation verification as an assertion, because
      we weren't passing in an assertion counter to `#mocha_verify`.
Commits on Nov 11, 2012
  1. @nikitug

    Match classes without to_s conversions.

    nikitug authored
    There is no need in `value_under_case.class.to_s` conversion since case already matches classes with `Class === value_under_case`.
Commits on Nov 10, 2012
  1. @AvnerCohen
Commits on Nov 9, 2012
  1. @steveklabnik

    Deprecate Hash#diff.

    steveklabnik authored
    It's no longer used in Rails any more.
    
    See #8142 for more
  2. @carlosantoniodasilva

    Merge pull request #7763 from route/full-capture

    carlosantoniodasilva authored
    Kernel#capture replaced by version which can catch output from subprocesses
Commits on Nov 7, 2012
  1. @tenderlove

    fix warnings in Ruby 2.0

    tenderlove authored
Commits on Nov 6, 2012
  1. @jeremy
Commits on Nov 5, 2012
  1. @carlosantoniodasilva
Commits on Nov 4, 2012
  1. @carlosantoniodasilva
  2. @nikitug

    Use `tag!` instead of `method_missing` in `to_xml` conversions.

    nikitug authored
    Since version `3.0.x` `Builder` caches method passed to `method_missing` each time. This commit replaces `method_missing` call with `tag!` call to prevent method redefinition on each `to_xml` call with the same builder.
Commits on Nov 3, 2012
  1. @spastorino
  2. @spastorino
  3. @spastorino
  4. @spastorino

    Add cookie.encrypted which returns an EncryptedCookieJar

    spastorino authored
    How to use it?
    
    cookies.encrypted[:discount] = 45
    => Set-Cookie: discount=ZS9ZZ1R4cG1pcUJ1bm80anhQang3dz09LS1mbDZDSU5scGdOT3ltQ2dTdlhSdWpRPT0%3D--ab54663c9f4e3bc340c790d6d2b71e92f5b60315; path=/
    cookies.encrypted[:discount]
    => 45
  5. @spastorino
Commits on Nov 2, 2012
  1. @vijaydev

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

    vijaydev authored
    Conflicts:
    	actionpack/lib/action_controller/metal/mime_responds.rb
    	activerecord/lib/active_record/attribute_methods.rb
    	guides/source/working_with_javascript_in_rails.md
  2. @steveklabnik

    Fixed timezone mapping of Solomon Islands.

    steveklabnik authored
    Fixes #8095.
    
    For reference, here is the discussion about the mapping being
    incorrect:
    http://rubyforge.org/pipermail/tzinfo-users/2012-November/000114.html
Something went wrong with that request. Please try again.