Permalink
Commits on Nov 1, 2013
Commits on Oct 30, 2013
  1. Release 4.0.1.rc4

    rafaelfranca committed Oct 30, 2013
  2. fix code typo in `MysqlAdapter` .Closes #12647.

    Conflicts:
    	activerecord/CHANGELOG.md
    senny committed Oct 28, 2013
Commits on Oct 23, 2013
  1. Merge pull request #12619 from Veraticus/fix_utils_normalize_path

    Correct error in Utils.normalize_path that changed paths improperly
    rafaelfranca committed Oct 23, 2013
  2. Fix the install task

    rafaelfranca committed Oct 23, 2013
  3. Merge pull request #12612 from amatsuda/amo_validates_inclusion_of_ti…

    …me_range_error
    
    Let validates_inclusion_of accept Time and DateTime ranges
    rafaelfranca committed Oct 23, 2013
Commits on Oct 22, 2013
Commits on Oct 21, 2013
  1. Release 4.0.1.rc2

    rafaelfranca committed Oct 21, 2013
  2. Merge pull request #12588 from jetthoughts/12586_subquery_with_unprep…

    …ared_sql
    
    Inline bind values for sub-queries generated for Relation in where
    
    Conflicts:
    	activerecord/CHANGELOG.md
    
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/test/cases/sanitize_test.rb
    
    Fixes #12586
    rafaelfranca committed Oct 21, 2013
  3. Escape the parentheses in the default function regexp

    This is causing every default value in PostreSQL database to being
    handled as default function.
    
    Fixes #12581
    rafaelfranca committed Oct 21, 2013
Commits on Oct 17, 2013
  1. Release 4.0.1.rc1

    rafaelfranca committed Oct 17, 2013
Commits on Oct 16, 2013
  1. Revert "Don't remove the select values to add they back again"

    This reverts commit 0785008.
    
    Reason: MySQL tests are broken with this change because STI information
    seems to be lost. We will apply a fix only on master for this.
    rafaelfranca committed Oct 16, 2013
  2. Merge pull request #12540 from wyaeld/bug/fix-recursive-digest

    Ensure ActionView::Digestor.cache is correctly cleaned up
    
    Conflicts:
    	actionview/CHANGELOG.md
    rafaelfranca committed Oct 16, 2013
  3. Merge pull request #12568 from adamyonk/patch-1

    Fix typo in form_helper.rb
    rafaelfranca committed Oct 16, 2013
Commits on Oct 15, 2013
  1. Merge pull request #12547 from derekprior/dp-fix-null-relation-pluck

    Pluck on NullRelation should accept a list of columns
    Conflicts:
    	activerecord/CHANGELOG.md
    rafaelfranca committed Oct 15, 2013
  2. Merge pull request #12543 from route/missed_require

    Add missed require making `enable_warnings` available
    rafaelfranca committed Oct 15, 2013
Commits on Oct 14, 2013
  1. Merge pull request #12536 from sbagdat/patch-1

    Remove size alias for length validation
    rafaelfranca committed Oct 14, 2013
  2. Merge pull request #10538 from neerajdotname/3882

    scope_chain should not be mutated for other reflections
    Conflicts:
    	activerecord/CHANGELOG.md
    rafaelfranca committed Oct 14, 2013
  3. Merge pull request #9499 from dmitry/inverse_instance_should_not_be_r…

    …eloaded_after_stale_state_change
    
    Inversed instance should not be reloaded after stale state was changed
    
    Conflicts:
    	activerecord/CHANGELOG.md
    
    Conflicts:
    	activerecord/CHANGELOG.md
    rafaelfranca committed Oct 14, 2013
  4. cleanup changelog entry format. [ci skip]

    Conflicts:
    	activerecord/CHANGELOG.md
    senny committed Oct 14, 2013
  5. Merge pull request #11880 from senny/backport_arel_fix

    Backport arel fix
    senny committed Oct 14, 2013
Commits on Oct 13, 2013
  1. Merge pull request #12508 from jetthoughts/12415_generate_subqueries_…

    …for_relation_from_binding_params
    
    Generate subquery for Relation passed as array condition for where
    
    Conflicts:
    	activerecord/CHANGELOG.md
    
    Conflicts:
    	activerecord/CHANGELOG.md
    rafaelfranca committed Oct 13, 2013
  2. Merge pull request #12511 from jetthoughts/informative_raise_message_…

    …for_incorrect_association
    
    Make missed association exception message more informative
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/associations/preloader.rb
    rafaelfranca committed Oct 13, 2013
  3. Merge pull request #12491 from shamanime/patch-1

    Fix wrong variable name used in the select_day method documentation
    rafaelfranca committed Oct 13, 2013