aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7702 from guilleiguaran/remove-manifest-optionSantiago Pastorino2012-09-195-13/+11
|\
| * Allow to use a local copy of sprockets-rails during developmentGuillermo Iguaran2012-09-191-1/+6
| * Remove highly uncommon `config.assets.manifest` option for moving the manifes...Guillermo Iguaran2012-09-194-12/+5
* | Merge pull request #7692 from frodsan/strong_params_docsSantiago Pastorino2012-09-193-14/+225
|\ \
| * | update AC::StrongParameters documentationFrancesco Rodriguez2012-09-191-8/+53
| * | define permitted? method instead of use an alias to fix rdocFrancesco Rodriguez2012-09-191-2/+12
| * | update AC::Parameters documentation [ci skip]Francesco Rodriguez2012-09-191-1/+149
| * | update AC::ParameterMissing documentation [ci skip]Francesco Rodriguez2012-09-191-2/+9
| * | update AR::AttributeAssignment documentation [ci skip]Francesco Rodriguez2012-09-191-5/+5
| * | update AC::ParamsWrapper documentation [ci skip]Francesco Rodriguez2012-09-191-3/+4
|/ /
* | Merge pull request #7710 from guilleiguaran/refactor-ar-attributes-methodRafael Mendonça França2012-09-191-10/+4
|\ \
| * | AR::Base#attributes= is just an alias for AR::Base#assign_attributesGuillermo Iguaran2012-09-191-10/+4
* | | Merge pull request #7709 from alexreisner/masterRafael Mendonça França2012-09-191-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix out-of-date URL.Alex Reisner2012-09-191-1/+1
|/ /
* | Merge pull request #7707 from guilleiguaran/changelogs-updateRafael Mendonça França2012-09-194-0/+50
|\ \
| * | Update changelogs to add entries about strong_parameters integrationGuillermo Iguaran2012-09-194-0/+50
|/ /
* | extracts manual development dependencies installation to a new non-promoted g...Xavier Noria2012-09-202-158/+176
* | Load the environment after creating the databaseJeremy Kemper2012-09-191-2/+2
* | Revert "Make sure :environment task is executed before db:schema:load or db:s...Jeremy Kemper2012-09-191-2/+2
* | 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.acti...Guillermo Iguaran2012-09-191-1/+1
* | | 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 hashDamien Mathieu2012-09-193-3/+18
* | | Merge pull request #7482 from route/syncing_tests_for_sprocketsRafael Mendonça França2012-09-192-33/+37
|\ \ \ | |/ / |/| |
| * | 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 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