Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | Remove highly uncommon `config.assets.manifest` option for moving the ↵ | Guillermo Iguaran | 2012-09-19 | 4 | -12/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | manifest path. This option is now unsupported in sprockets-rails. | |||||
* | | | | | | | | Merge pull request #7692 from frodsan/strong_params_docs | Santiago Pastorino | 2012-09-19 | 3 | -14/+225 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | update docs for strong parameters merge | |||||
| * | | | | | | | | update AC::StrongParameters documentation | Francesco Rodriguez | 2012-09-19 | 1 | -8/+53 | |
| | | | | | | | | | ||||||
| * | | | | | | | | define permitted? method instead of use an alias to fix rdoc | Francesco Rodriguez | 2012-09-19 | 1 | -2/+12 | |
| | | | | | | | | | ||||||
| * | | | | | | | | update AC::Parameters documentation [ci skip] | Francesco Rodriguez | 2012-09-19 | 1 | -1/+149 | |
| | | | | | | | | | ||||||
| * | | | | | | | | update AC::ParameterMissing documentation [ci skip] | Francesco Rodriguez | 2012-09-19 | 1 | -2/+9 | |
| | | | | | | | | | ||||||
| * | | | | | | | | update AR::AttributeAssignment documentation [ci skip] | Francesco Rodriguez | 2012-09-19 | 1 | -5/+5 | |
| | | | | | | | | | ||||||
| * | | | | | | | | update AC::ParamsWrapper documentation [ci skip] | Francesco Rodriguez | 2012-09-19 | 1 | -3/+4 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #7710 from guilleiguaran/refactor-ar-attributes-method | Rafael Mendonça França | 2012-09-19 | 1 | -10/+4 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | AR::Base#attributes= is just an alias for AR::Base#assign_attributes | |||||
| * | | | | | | | | AR::Base#attributes= is just an alias for AR::Base#assign_attributes | Guillermo Iguaran | 2012-09-19 | 1 | -10/+4 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #7709 from alexreisner/master | Rafael Mendonça França | 2012-09-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | Fix Broken Link in ActiveRecord Transaction Documentation [ci skip] | |||||
| * | | | | | | | | Fix out-of-date URL. | Alex Reisner | 2012-09-19 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #7707 from guilleiguaran/changelogs-update | Rafael Mendonça França | 2012-09-19 | 4 | -0/+50 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Update changelogs to add entries about strong_parameters integration | |||||
| * | | | | | | | | Update changelogs to add entries about strong_parameters integration | Guillermo Iguaran | 2012-09-19 | 4 | -0/+50 | |
|/ / / / / / / / | ||||||
* | | | | | | | | extracts manual development dependencies installation to a new non-promoted ↵ | Xavier Noria | 2012-09-20 | 2 | -158/+176 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
* | | | | | | | | Load the environment after creating the database | Jeremy Kemper | 2012-09-19 | 1 | -2/+2 | |
| | | | | | | | | ||||||
* | | | | | | | | Revert "Make sure :environment task is executed before db:schema:load or ↵ | Jeremy Kemper | 2012-09-19 | 1 | -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-explicitly | Rafael Mendonça França | 2012-09-19 | 1 | -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 Iguaran | 2012-09-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config.action_controller.permit_all_parameters is not present | |||||
* | | | | | | | | | Improve the CHANGELOG entry for #6971 | Rafael Mendonça França | 2012-09-19 | 1 | -1/+14 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #6971 from dmathieu/empty_hash | Rafael Mendonça França | 2012-09-19 | 3 | -3/+18 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | fix querying with an empty hash | |||||
| * | | | | | | | fix querying with an empty hash | Damien Mathieu | 2012-09-19 | 3 | -3/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #6960 | |||||
* | | | | | | | | Merge pull request #7482 from route/syncing_tests_for_sprockets | Rafael Mendonça França | 2012-09-19 | 2 | -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 rails | Dmitry Vorotilin | 2012-09-19 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Use last version of sprockets-rails and syncing tests for assets. | Dmitry Vorotilin | 2012-09-19 | 2 | -32/+36 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #7668 from Draiken/fix_issue_6497 | Rafael Mendonça França | 2012-09-19 | 3 | -3/+20 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Removing to_shorthand to fix #6497 | |||||
| * | | | | | | | Removing to_shorthand from default_controller_and_action. Fixes #6497 | Luiz Felipe | 2012-09-19 | 3 | -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-cleanups | Carlos Antonio da Silva | 2012-09-19 | 1 | -5/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Minor cleanups missed during mass assignment options removal from AR | |||||
| * | | | | | | Remove unused private method AR::NestedAttributes#unassignable_keys and ↵ | Guillermo Iguaran | 2012-09-19 | 1 | -5/+1 | |
|/ / / / / / | | | | | | | | | | | | | | | | | | | reference to mass_assignment options | |||||
* | | | | | | Merge pull request #7694 from guilleiguaran/update-ar-docs | Rafael Mendonça França | 2012-09-18 | 2 | -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 Iguaran | 2012-09-18 | 1 | -11/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | references to mass assignment options | |||||
| * | | | | | | Update docs for AR::Base#new to remove references to mass_assignment_options | Guillermo Iguaran | 2012-09-18 | 1 | -10/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #7693 from parndt/patch-6 | Rafael Mendonça França | 2012-09-18 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Correct parameter access. | |||||
| * | | | | | | Correct parameter access. | Philip Arndt | 2012-09-19 | 1 | -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ça | 2012-09-18 | 1 | -4/+4 | |
| | | | | | | ||||||
* | | | | | | No need to defensively work jobs in another thread | Jeremy Kemper | 2012-09-18 | 2 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #7691 from lest/patch-1 | Rafael Mendonça França | 2012-09-18 | 1 | -3/+3 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | fix shadowing outer local variable warning | |||||
| * | | | | | | fix shadowing outer local variable warning | Sergey Nartimov | 2012-09-19 | 1 | -3/+3 | |
|/ / / / / / | ||||||
* | | | | | | let .md be the only supported extension for guides | Xavier Noria | 2012-09-18 | 1 | -4/+4 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #7251 from rails/integrate-strong_parameters | David Heinemeier Hansson | 2012-09-18 | 74 | -2232/+662 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Integrate strong_parameters in Rails 4 | |||||
| * | | | | | | Set primary key with id= only if primary key exists | Guillermo Iguaran | 2012-09-16 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Remove mass_assignment_options from ActiveRecord | Guillermo Iguaran | 2012-09-16 | 18 | -162/+66 | |
| | | | | | | | ||||||
| * | | | | | | AC::ParameterMissing inherits from KeyError since it's more appropiated than ↵ | Guillermo Iguaran | 2012-09-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | IndexError | |||||
| * | | | | | | attr_accessible and attr_protected raise an exception pointing to use plugin ↵ | Guillermo Iguaran | 2012-09-16 | 5 | -0/+41 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | or new protection model | |||||
| * | | | | | | Support fields_for attributes, which may have numeric symbols as hash keys | Guillermo Iguaran | 2012-09-16 | 2 | -0/+22 | |
| | | | | | | | ||||||
| * | | | | | | Add config.action_controller.permit_all_attributes to bypass ↵ | Guillermo Iguaran | 2012-09-16 | 5 | -1/+43 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | StrongParameters protection | |||||
| * | | | | | | Change tainted/untainted wording to permitted/forbidden | Guillermo Iguaran | 2012-09-16 | 3 | -26/+26 | |
| | | | | | | | ||||||
| * | | | | | | Don't use assert_nothing_raised when assert_equal is used | Guillermo Iguaran | 2012-09-16 | 3 | -22/+10 | |
| | | | | | | | ||||||
| * | | | | | | Change scaffold_generator: Don't use #require or #permit in scaffold if ↵ | Guillermo Iguaran | 2012-09-16 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | attributes list isn't given | |||||
| * | | | | | | Rename ForbiddenAttributes exception to ForbiddenAttributesError | Guillermo Iguaran | 2012-09-16 | 4 | -5/+5 | |
| | | | | | | |