Permalink
Commits on Sep 20, 2012
  1. Merge pull request #7710 from guilleiguaran/refactor-ar-attributes-me…

    rafaelfranca committed Sep 20, 2012
    …thod
    
    AR::Base#attributes= is just an alias for AR::Base#assign_attributes
  2. Merge pull request #7709 from alexreisner/master

    rafaelfranca committed Sep 20, 2012
    Fix Broken Link in ActiveRecord Transaction Documentation [ci skip]
  3. Fix out-of-date URL.

    alexreisner committed Sep 19, 2012
Commits on Sep 19, 2012
  1. Merge pull request #7707 from guilleiguaran/changelogs-update

    rafaelfranca committed Sep 19, 2012
    Update changelogs to add entries about strong_parameters integration
  2. extracts manual development dependencies installation to a new non-pr…

    fxn committed Sep 19, 2012
    …omoted guide
    
    The purpose of this refactor is twofold:
    
      * Emphasize the Rails development box as
        the recommended way to setup a dev
        environment by taking out the rest of
        the instructions.
    
      * Lighten the contributing guide, this
        non-essential information takes a
        disproportionate amount of space now
        that we have the rails-dev-box.
  3. Revert "Make sure :environment task is executed before db:schema:load…

    jeremy committed Sep 19, 2012
    … or db:structure:load
    "
    
    Breaks db:setup because it tries to load the environment before creating the database.
    
    This reverts commit 5ca11fe.
  4. Merge pull request #7701 from guilleiguaran/set-permit-all-parameters…

    rafaelfranca committed Sep 19, 2012
    …-explicitly
    
    Set AC::Parameters.permit_all_parameters explicitly to false when config.action_controller.permit_all_parameters is not present
  5. Set AC::Parameters.permit_all_parameters explicitly to false when con…

    guilleiguaran committed Sep 19, 2012
    …fig.action_controller.permit_all_parameters is not present
  6. Merge pull request #6971 from dmathieu/empty_hash

    rafaelfranca committed Sep 19, 2012
    fix querying with an empty hash
  7. Merge pull request #7482 from route/syncing_tests_for_sprockets

    rafaelfranca committed Sep 19, 2012
    Use last version of sprockets-rails and sync tests for assets.
  8. fix querying with an empty hash

    dmathieu committed Jul 5, 2012
    Closes #6960
  9. Merge pull request #7668 from Draiken/fix_issue_6497

    rafaelfranca committed Sep 19, 2012
    Removing to_shorthand to fix #6497
  10. Merge pull request #7697 from guilleiguaran/minor-ar-cleanups

    carlosantoniodasilva committed Sep 19, 2012
    Minor cleanups missed during mass assignment options removal from AR
  11. Removing to_shorthand from default_controller_and_action. Fixes #6497

    Draiken committed Sep 17, 2012
    When using shortcut routes inside an engine the "to_shorthand" variable
    is set to true, causing the module scope of the route to not be applied.
  12. Remove unused private method AR::NestedAttributes#unassignable_keys a…

    guilleiguaran committed Sep 19, 2012
    …nd reference to mass_assignment options
  13. Merge pull request #7694 from guilleiguaran/update-ar-docs

    rafaelfranca committed Sep 19, 2012
    Update AR docs to remove reference to mass assignment options
  14. Update AR::Base.create and AR:Base#update_attributes docs to remove r…

    guilleiguaran committed Sep 19, 2012
    …eferences to mass assignment options
  15. Merge pull request #7693 from parndt/patch-6

    rafaelfranca committed Sep 19, 2012
    Correct parameter access.
  16. Correct parameter access.

    parndt committed Sep 19, 2012
    * The params as supplied pass born in authors[0] but not authors[1] so it seems like the test isn't covering what it should be covering.
Commits on Sep 18, 2012
  1. Merge pull request #7691 from lest/patch-1

    rafaelfranca committed Sep 18, 2012
    fix shadowing outer local variable warning
  2. Merge pull request #7251 from rails/integrate-strong_parameters

    dhh committed Sep 18, 2012
    Integrate strong_parameters in Rails 4
  3. add some kindness

    fxn committed Sep 18, 2012
  4. Merge pull request #7681 from schneems/schneems/stronger-wording

    fxn committed Sep 18, 2012
    Stronger wording in Contributing file
  5. Stronger wording in Contributing file

    schneems committed Sep 18, 2012
    Explicitly tell users to read the guide before submitting code. re: #7677. Specify the name of the mailing list for rubyonrails-talk to help differentiate it from rubyonrails-core mailing list.