Permalink
Commits on Oct 3, 2012
  1. Refactor

    spastorino committed Oct 3, 2012
  2. Use the `flat_map` method.

    rafaelfranca committed Oct 3, 2012
    Thanks to @jeremy to teach me this one.
  3. Revert "Merge pull request #7826 from sikachu/master-validators-kind"

    rafaelfranca committed Oct 3, 2012
    This reverts commit 4e9f53f, reversing
    changes made to 6b802cd.
    
    Revert "Don't use tap in this case."
    
    This reverts commit 454d820.
    
    Reason: Is not a good idea to add options to this method since we can do
    the same thing using method composition.
    
        Person.validators_on(:name).select { |v| v.kind == :presence }
    
    Also it avoids to change the method again to add more options.
  4. Don't use tap in this case.

    rafaelfranca committed Oct 3, 2012
    The use of tap in this case is very confusing since we are mutating the
    return value inside the block
  5. Merge pull request #7826 from sikachu/master-validators-kind

    rafaelfranca committed Oct 3, 2012
    Make `.validators_on` accept `:kind` option
  6. Make `.validators_on` accept `:kind` option

    sikachu committed Oct 3, 2012
    This will filter out the validators on a particular attribute based on
    its kind.
  7. Merge pull request #7825 from sikachu/master-rails-pathname

    rafaelfranca committed Oct 3, 2012
    Make Rails.public_path return a Pathname
Commits on Oct 2, 2012
  1. Merge pull request #6952 from NZKoz/key_generator

    NZKoz committed Oct 2, 2012
    Add ActiveSupport::KeyGenerator as a simple wrapper around PBKDF2
  2. fix warning: method redefined

    kennyj committed with Rafael Mendonça França Sep 15, 2012
  3. Merge pull request #7822 from lulalala/reset-counter-cache-for-has-ma…

    rafaelfranca committed Oct 2, 2012
    …ny-through
    
    Fix reset_counters crashing on has_many :through associations.
  4. Fix reset_counters() crashing on has_many :through associations.

    lulalala committed Oct 2, 2012
    The counter column name in the intermediate model need to be access
    via the through reflection.
  5. Merge pull request #7636 from steveklabnik/issue_5660

    rafaelfranca committed Oct 2, 2012
    Fixes issue #5660: Failsafe exception returns text/html and text/plain.
  6. Failsafe exception returns text/plain.

    steveklabnik committed Jul 6, 2012
    It's best to just return text/plain when something has gone terribly
    wrong.
    
    Fixes #5660.
  7. Merge pull request #7708 from bdurand/optimize_log_subscribers

    rafaelfranca committed Oct 2, 2012
    Optimize log subscribers to check if the log level is sufficient
  8. Merge pull request #7794 from guilleiguaran/extract-rack-cache

    spastorino committed Oct 2, 2012
    Use Rack::Cache middleware only if is in Gemfile
  9. Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_va…

    rafaelfranca committed Oct 2, 2012
    …riables
    
    prefix TemplateAssertions ivars.
    
    Closes #7459
Commits on Oct 1, 2012
  1. Merge pull request #7789 from senny/7777_resource_functions_modify_op…

    rafaelfranca committed Oct 1, 2012
    …tions
    
    resource and resources do no longer modify passed options
  2. resource and resources do no longer modify passed options

    senny committed Sep 29, 2012
    this is a patch for #7777.
  3. Merge pull request #7813 from arunagw/warning_fixed_as

    rafaelfranca committed Oct 1, 2012
    warning fixed: (...) interpreted as grouped expression
  4. Merge pull request #7812 from bdurand/optimize_cache_entry_take_2

    jeremy committed Oct 1, 2012
    fix broken cache tests
  5. fix broken cache tests

    Brian Durand committed Oct 1, 2012
  6. Merge pull request #7811 from iHiD/resource_generator_routes_master

    spastorino committed Oct 1, 2012
    Fix the build (Broken scaffold routes test)
  7. Fix broken scaffold routes test

    iHiD committed Oct 1, 2012
  8. Merge pull request #7810 from steveklabnik/fix_build

    jeremy committed Oct 1, 2012
    fix cache store test
  9. fix cache store test

    steveklabnik committed Oct 1, 2012
    Pull #7800 broke the build, this should fix it.
  10. Provide access to the application's KeyGenerator

    NZKoz committed Oct 1, 2012
    Available both as an env entry for rack and an instance method on Rails::Application for other uses
  11. Merge pull request #6450 from iHiD/resource_generator_routes_master

    rafaelfranca committed Oct 1, 2012
    Master branch: Fixed generated whitespace in routes when using namespaced resource.
  12. Add ActiveSupport::KeyGenerator as a simple wrapper around PBKDF2

    NZKoz committed Jul 4, 2012
    This will be used to derive keys from the secret and a salt, in order to allow us to
    do things like encrypted cookie stores without using the secret for multiple
    purposes directly.