aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'optimize_log_subscribers' of github.com:bdurand/rails into ↵Brian Durand2012-09-300-0/+0
|\ | | | | | | optimize_log_subscribers
| * Fix ActionMailer::LogSubscriber to use the correct log level check.Brian Durand2012-09-191-2/+2
| |
| * Optimize log subscribers to check if the log level is sufficient before ↵Brian Durand2012-09-194-14/+26
| | | | | | | | performing an operations.
* | Optimize log subscribers to check if the log level is sufficient before ↵Brian Durand2012-09-305-14/+28
|/ | | | performing an operations.
* Load the environment after creating the databaseJeremy Kemper2012-09-191-2/+2
|
* Revert "Make sure :environment task is executed before db:schema:load or ↵Jeremy Kemper2012-09-191-2/+2
| | | | | | | | db:structure:load " Breaks db:setup because it tries to load the environment before creating the database. This reverts commit 5ca11fefce6d83f5db399aa4412f1f1a0d42b2e6.
* Merge pull request #7701 from guilleiguaran/set-permit-all-parameters-explicitlyRafael Mendonça França2012-09-191-1/+1
|\ | | | | Set AC::Parameters.permit_all_parameters explicitly to false when config.action_controller.permit_all_parameters is not present
| * Set AC::Parameters.permit_all_parameters explicitly to false when ↵Guillermo Iguaran2012-09-191-1/+1
| | | | | | | | config.action_controller.permit_all_parameters is not present
* | Improve the CHANGELOG entry for #6971Rafael Mendonça França2012-09-191-1/+14
|/
* Merge pull request #6971 from dmathieu/empty_hashRafael Mendonça França2012-09-193-3/+18
|\ | | | | fix querying with an empty hash
| * fix querying with an empty hashDamien Mathieu2012-09-193-3/+18
| | | | | | | | Closes #6960
* | Merge pull request #7482 from route/syncing_tests_for_sprocketsRafael Mendonça França2012-09-192-33/+37
|\ \ | |/ |/| Use last version of sprockets-rails and sync tests for assets.
| * Since in sprockets-rails uglifier's version doesn't matter do the same in railsDmitry Vorotilin2012-09-191-1/+1
| |
| * Use last version of sprockets-rails and syncing tests for assets.Dmitry Vorotilin2012-09-192-32/+36
| |
* | Merge pull request #7668 from Draiken/fix_issue_6497Rafael Mendonça França2012-09-193-3/+20
|\ \ | | | | | | Removing to_shorthand to fix #6497
| * | Removing to_shorthand from default_controller_and_action. Fixes #6497Luiz Felipe2012-09-193-3/+20
| |/ | | | | | | | | 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.
* | Merge pull request #7697 from guilleiguaran/minor-ar-cleanupsCarlos Antonio da Silva2012-09-191-5/+1
|\ \ | |/ |/| Minor cleanups missed during mass assignment options removal from AR
| * Remove unused private method AR::NestedAttributes#unassignable_keys and ↵Guillermo Iguaran2012-09-191-5/+1
|/ | | | reference to mass_assignment options
* Merge pull request #7694 from guilleiguaran/update-ar-docsRafael Mendonça França2012-09-182-21/+1
|\ | | | | Update AR docs to remove reference to mass assignment options
| * Update AR::Base.create and AR:Base#update_attributes docs to remove ↵Guillermo Iguaran2012-09-181-11/+0
| | | | | | | | references to mass assignment options
| * 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.
| * Correct parameter access.Philip Arndt2012-09-191-1/+1
|/ | | * 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.
* 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 warning
| * 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
|\ | | | | Integrate strong_parameters in Rails 4
| * 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
| | | | | | | | IndexError
| * attr_accessible and attr_protected raise an exception pointing to use plugin ↵Guillermo Iguaran2012-09-165-0/+41
| | | | | | | | or new protection model
| * 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 ↵Guillermo Iguaran2012-09-165-1/+43
| | | | | | | | StrongParameters protection
| * 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 ↵Guillermo Iguaran2012-09-161-0/+4
| | | | | | | | attributes list isn't given
| * Rename ForbiddenAttributes exception to ForbiddenAttributesErrorGuillermo Iguaran2012-09-164-5/+5
| |
| * config.activerecord.whitelist_attributes isn't used anymore, remove ↵Guillermo Iguaran2012-09-161-3/+0
| | | | | | | | reference from abstract_unit
| * 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
| | | | | | | | permissible params
| * require abstract_unit in parameters testsGuillermo Iguaran2012-09-163-0/+3
| |
| * Remove integration between attr_accessible/protected and ↵Guillermo Iguaran2012-09-163-48/+2
| | | | | | | | AC::Metal::ParamsWrapper
| * Remove all references to attr_accessible/protected and old ↵Guillermo Iguaran2012-09-166-33/+0
| | | | | | | | mass_assignment_sanitizers
| * Change AMo::ForbiddenAttributesProtection tests to use a subclass of Hash ↵Guillermo Iguaran2012-09-161-8/+18
| | | | | | | | instead of monkey patch permitted? method in regular hashes
| * 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
| | | | | | | | This will be moved out to protected_attributes gem
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-16 14:13:40 +0000