Commits on Dec 8, 2013
  1. Revert "Merge pull request #13235 from strzalek/variants-inline" -- n…

    dhh committed Dec 8, 2013
    …eeds a little more work!
    This reverts commit 1861611, reversing
    changes made to cad9eb1.
  2. Merge pull request #13235 from strzalek/variants-inline

    dhh committed Dec 8, 2013
    Inline syntax for variants
  3. Inline variants syntax

    lukaszx0 committed Dec 8, 2013
    In most cases, when setting variant specific code, you're not sharing any code
    within format.
    Inline syntax can vastly simplify defining variants in those sitiations:
      respond_to do |format|
        format.js { render "trash" }
        format.html do |variant|
 { redirect_to progress_path }
          variant.none  { render "trash" }
      respond_to do |format|
        format.js         { render "trash" } { redirect_to progress_path }
        format.html.none  { render "trash" }
  4. Simplify @responses hash initialization

    lukaszx0 committed Dec 8, 2013
    @responses hash needs to be initialized with mime types that we get from
    Collector#collect_mimes_from_class_level. Mime::Type class as key and nil as
    value. This need to happen before content negotiation. Before that, it was
    looping though mime types and executing mime-type-generated method inside
    collector (see
    AbstractController::Collector#generate_method_for_mime). That approach resulted
    in 2 unnecessary method calls for each mime type
    collected by Collector#collect_mimes_from_class_level.
    Now hash is initialized in place, without usage of Collector#custom method.
  5. Merge pull request #13231 from chancancode/upgrade_minitest

    guilleiguaran committed Dec 8, 2013
    Upgrade minitest version
  6. Upgrade minitest version

    chancancode committed Dec 8, 2013
    We made a change in #13213 that depends on a new file that's only in
    minitest 5.1.0+, so the version should be updated.
  7. Merge pull request #13232 from strzalek/av-missing-requires

    rafaelfranca committed Dec 8, 2013
    Require action_view explicitly in AC::Base
Commits on Dec 7, 2013
  1. Merge pull request #13221 from stereoscott/patch-1

    chancancode committed Dec 7, 2013
    fix tiny typo in comment, "state_state" should be "stale_state" [ci skip]
Commits on Dec 6, 2013
  1. Merge pull request #13219 from robin850/patch-11

    chancancode committed Dec 6, 2013
    Very tiny typo fix [ci skip]
  2. Very tiny typo fix [ci skip]

    robin850 committed Dec 6, 2013
  3. Merge pull request #13059 from imkmf/cycle-accepts-array

    rafaelfranca committed Dec 6, 2013
    Cycle object should accept an array
  4. A Cycle object should accept an array and cycle through it as it would

    imkmf committed Nov 26, 2013
    with a set of comma-separated objects.
  5. Merge pull request #13213 from arunagw/aa-minitest-version-fix

    tenderlove committed Dec 6, 2013
    Minitest upgrade broke build
  6. Merge pull request #13214 from JuanitoFatas/master

    chancancode committed Dec 6, 2013
    Some improvements on building nested forms. [ci skip]
  7. better error message for constants autoloaded from anonymous modules [f…

    fxn committed Dec 6, 2013
    …ixes #13204]
    load_missing_constant is a private method that basically plays the role of const_missing.
    This method has an error condition that is surprising: it raises if the class or module
    already has the missing constant. How is it possible that if the class of module has
    the constant Ruby has called const_missing in the first place?
    The answer is that the from_mod argument is self except for anonymous modules, because
    const_missing passes down Object in such case (see the comment in the source code of the
    patch for the rationale).
    But then, it is better to pass down Object *if Object is also missing the constant* and
    otherwise err with an informative message right away.
  8. Merge pull request #10635 from vipulnsward/change_to_strict

    jeremy committed Dec 6, 2013
    Use `Base.strict_decode64` instead of `Base.decode64`
  9. Minitest upgrade broke build

    arunagw committed Dec 6, 2013
    This PR should fix build
  10. Merge pull request #13216 from arunagw/plugin-gemfile-jruby

    rafaelfranca committed Dec 6, 2013
    Skipping debugger from plugin Gemfile for JRuby
  11. Merge pull request #13212 from arunagw/vcf-mime-type-build-fix

    carlosantoniodasilva committed Dec 6, 2013
    Fixed test for Mime::VCF
  12. Fixed test for Mime::VCF

    arunagw committed Dec 6, 2013
    Added here 13dd38c
  13. Merge pull request #13211 from psahni/master

    arunagw committed Dec 6, 2013
    capitalize words starting after numbered list to maintain consistency [c...
  14. Merge pull request #13198 from chancancode/enum_docs

    chancancode committed Dec 6, 2013
    Make clear that the enum array should not be changed once defined. [ci skip]
Commits on Dec 5, 2013
  1. Merge pull request #12684 from mariovisic/fix_kernel_silence_stream_d…

    carlosantoniodasilva committed Dec 5, 2013
    Fix issue with Kernel#silence_stream leaking file descriptors