aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix querying with an empty hashDamien Mathieu2012-09-193-3/+18
* Merge pull request #7668 from Draiken/fix_issue_6497Rafael Mendonça França2012-09-193-3/+20
|\
| * Removing to_shorthand from default_controller_and_action. Fixes #6497Luiz Felipe2012-09-193-3/+20
* | Merge pull request #7697 from guilleiguaran/minor-ar-cleanupsCarlos Antonio da Silva2012-09-191-5/+1
|\ \ | |/ |/|
| * Remove unused private method AR::NestedAttributes#unassignable_keys and refer...Guillermo Iguaran2012-09-191-5/+1
|/
* Merge pull request #7694 from guilleiguaran/update-ar-docsRafael Mendonça França2012-09-182-21/+1
|\
| * Update AR::Base.create and AR:Base#update_attributes docs to remove reference...Guillermo Iguaran2012-09-181-11/+0
| * Update docs for AR::Base#new to remove references to mass_assignment_optionsGuillermo Iguaran2012-09-181-10/+1
|/
* Merge pull request #7693 from parndt/patch-6Rafael Mendonça França2012-09-181-1/+1
|\
| * Correct parameter access.Philip Arndt2012-09-191-1/+1
|/
* In development and test we drain the jobs in the same thread.Rafael Mendonça França2012-09-181-4/+4
* No need to defensively work jobs in another threadJeremy Kemper2012-09-182-2/+2
* Merge pull request #7691 from lest/patch-1Rafael Mendonça França2012-09-181-3/+3
|\
| * fix shadowing outer local variable warningSergey Nartimov2012-09-191-3/+3
|/
* let .md be the only supported extension for guidesXavier Noria2012-09-181-4/+4
* Merge pull request #7251 from rails/integrate-strong_parametersDavid Heinemeier Hansson2012-09-1874-2232/+662
|\
| * Set primary key with id= only if primary key existsGuillermo Iguaran2012-09-161-1/+1
| * Remove mass_assignment_options from ActiveRecordGuillermo Iguaran2012-09-1618-162/+66
| * AC::ParameterMissing inherits from KeyError since it's more appropiated than ...Guillermo Iguaran2012-09-161-1/+1
| * attr_accessible and attr_protected raise an exception pointing to use plugin ...Guillermo Iguaran2012-09-165-0/+41
| * Support fields_for attributes, which may have numeric symbols as hash keysGuillermo Iguaran2012-09-162-0/+22
| * Add config.action_controller.permit_all_attributes to bypass StrongParameters...Guillermo Iguaran2012-09-165-1/+43
| * Change tainted/untainted wording to permitted/forbiddenGuillermo Iguaran2012-09-163-26/+26
| * Don't use assert_nothing_raised when assert_equal is usedGuillermo Iguaran2012-09-163-22/+10
| * Change scaffold_generator: Don't use #require or #permit in scaffold if attri...Guillermo Iguaran2012-09-161-0/+4
| * Rename ForbiddenAttributes exception to ForbiddenAttributesErrorGuillermo Iguaran2012-09-164-5/+5
| * config.activerecord.whitelist_attributes isn't used anymore, remove reference...Guillermo Iguaran2012-09-161-3/+0
| * Remove configuration test for config.activerecord.whitelist_attributesGuillermo Iguaran2012-09-161-13/+0
| * Remove attributes whitelist tests from AppGenerator testsGuillermo Iguaran2012-09-161-6/+0
| * Change scaffold_controller to generate and use private method to encapsulate ...Guillermo Iguaran2012-09-164-8/+21
| * require abstract_unit in parameters testsGuillermo Iguaran2012-09-163-0/+3
| * Remove integration between attr_accessible/protected and AC::Metal::ParamsWra...Guillermo Iguaran2012-09-163-48/+2
| * Remove all references to attr_accessible/protected and old mass_assignment_sa...Guillermo Iguaran2012-09-166-33/+0
| * Change AMo::ForbiddenAttributesProtection tests to use a subclass of Hash ins...Guillermo Iguaran2012-09-161-8/+18
| * Add tests for ForbiddenAttributesProtection in ActiveRecordGuillermo Iguaran2012-09-161-0/+63
| * Remove mass assignment security from ActiveRecordGuillermo Iguaran2012-09-1620-1170/+18
| * Remove MassAssignmentSecurity from ActiveModelGuillermo Iguaran2012-09-1616-816/+15
| * Integrate ActiveModel::ForbiddenAttributesProtection from StrongParameters gemGuillermo Iguaran2012-09-164-0/+54
| * Integrate ActionController::Parameters from StrongParameters gemGuillermo Iguaran2012-09-168-0/+340
* | add some kindnessXavier Noria2012-09-181-2/+2
* | Merge pull request #7681 from schneems/schneems/stronger-wordingXavier Noria2012-09-181-3/+3
|\ \
| * | Stronger wording in Contributing fileschneems2012-09-181-3/+3
* | | Merge pull request #5339 from gregolsen/week_start_configRafael Mendonça França2012-09-189-18/+149
|\ \ \ | |/ / |/| |
| * | Date.beginning_of_week thread local and beginning_of_week application config ...gregolsen2012-09-189-18/+149
* | | the contributing guide should be mentioned upfrontXavier Noria2012-09-181-4/+6
* | | Merge pull request #7676 from frodsan/patch-7Xavier Noria2012-09-181-0/+3
|\ \ \
| * | | show love to contributorsFrancesco Rodríguez2012-09-171-0/+3
* | | | Merge pull request #7680 from steveklabnik/masterRafael Mendonça França2012-09-181-1/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove 'assigned but unused variable' warningSteve Klabnik2012-09-181-1/+2
* | | | spurious space I saw in passingXavier Noria2012-09-181-1/+1