| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | | | | | | | 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 | Damien Mathieu | 2012-09-19 | 3 | -3/+18 |
* | | | | | | | | | Merge pull request #7482 from route/syncing_tests_for_sprockets | Rafael Mendonça França | 2012-09-19 | 2 | -33/+37 |
|\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
|/| | | | | | | | |
|
| * | | | | | | | | 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 from default_controller_and_action. Fixes #6497 | Luiz Felipe | 2012-09-19 | 3 | -3/+20 |
| |/ / / / / / / |
|
* | | | | | | | | Merge pull request #7697 from guilleiguaran/minor-ar-cleanups | Carlos Antonio da Silva | 2012-09-19 | 1 | -5/+1 |
|\ \ \ \ \ \ \ \
| |/ / / / / / /
|/| | | | | | | |
|
| * | | | | | | | Remove unused private method AR::NestedAttributes#unassignable_keys and refer... | Guillermo Iguaran | 2012-09-19 | 1 | -5/+1 |
|/ / / / / / / |
|
* | | | | | | | Merge pull request #7694 from guilleiguaran/update-ar-docs | Rafael Mendonça França | 2012-09-18 | 2 | -21/+1 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Update AR::Base.create and AR:Base#update_attributes docs to remove reference... | Guillermo Iguaran | 2012-09-18 | 1 | -11/+0 |
| * | | | | | | | 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. | Philip Arndt | 2012-09-19 | 1 | -1/+1 |
|/ / / / / / / |
|
* | | | | | | | 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 | 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 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | 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 |
| * | | | | | | | attr_accessible and attr_protected raise an exception pointing to use plugin ... | Guillermo Iguaran | 2012-09-16 | 5 | -0/+41 |
| * | | | | | | | 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 StrongParameters... | Guillermo Iguaran | 2012-09-16 | 5 | -1/+43 |
| * | | | | | | | 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 attri... | Guillermo Iguaran | 2012-09-16 | 1 | -0/+4 |
| * | | | | | | | Rename ForbiddenAttributes exception to ForbiddenAttributesError | Guillermo Iguaran | 2012-09-16 | 4 | -5/+5 |
| * | | | | | | | config.activerecord.whitelist_attributes isn't used anymore, remove reference... | Guillermo Iguaran | 2012-09-16 | 1 | -3/+0 |
| * | | | | | | | Remove configuration test for config.activerecord.whitelist_attributes | Guillermo Iguaran | 2012-09-16 | 1 | -13/+0 |
| * | | | | | | | Remove attributes whitelist tests from AppGenerator tests | Guillermo Iguaran | 2012-09-16 | 1 | -6/+0 |
| * | | | | | | | Change scaffold_controller to generate and use private method to encapsulate ... | Guillermo Iguaran | 2012-09-16 | 4 | -8/+21 |
| * | | | | | | | require abstract_unit in parameters tests | Guillermo Iguaran | 2012-09-16 | 3 | -0/+3 |
| * | | | | | | | Remove integration between attr_accessible/protected and AC::Metal::ParamsWra... | Guillermo Iguaran | 2012-09-16 | 3 | -48/+2 |
| * | | | | | | | Remove all references to attr_accessible/protected and old mass_assignment_sa... | Guillermo Iguaran | 2012-09-16 | 6 | -33/+0 |
| * | | | | | | | Change AMo::ForbiddenAttributesProtection tests to use a subclass of Hash ins... | Guillermo Iguaran | 2012-09-16 | 1 | -8/+18 |
| * | | | | | | | Add tests for ForbiddenAttributesProtection in ActiveRecord | Guillermo Iguaran | 2012-09-16 | 1 | -0/+63 |
| * | | | | | | | Remove mass assignment security from ActiveRecord | Guillermo Iguaran | 2012-09-16 | 20 | -1170/+18 |
| * | | | | | | | Remove MassAssignmentSecurity from ActiveModel | Guillermo Iguaran | 2012-09-16 | 16 | -816/+15 |
| * | | | | | | | Integrate ActiveModel::ForbiddenAttributesProtection from StrongParameters gem | Guillermo Iguaran | 2012-09-16 | 4 | -0/+54 |
| * | | | | | | | Integrate ActionController::Parameters from StrongParameters gem | Guillermo Iguaran | 2012-09-16 | 8 | -0/+340 |
* | | | | | | | | add some kindness | Xavier Noria | 2012-09-18 | 1 | -2/+2 |
* | | | | | | | | Merge pull request #7681 from schneems/schneems/stronger-wording | Xavier Noria | 2012-09-18 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Stronger wording in Contributing file | schneems | 2012-09-18 | 1 | -3/+3 |
* | | | | | | | | | Merge pull request #5339 from gregolsen/week_start_config | Rafael Mendonça França | 2012-09-18 | 9 | -18/+149 |
|\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
|/| | | | | | | | |
|
| * | | | | | | | | Date.beginning_of_week thread local and beginning_of_week application config ... | gregolsen | 2012-09-18 | 9 | -18/+149 |
* | | | | | | | | | the contributing guide should be mentioned upfront | Xavier Noria | 2012-09-18 | 1 | -4/+6 |
* | | | | | | | | | Merge pull request #7676 from frodsan/patch-7 | Xavier Noria | 2012-09-18 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ |
|