aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Add changelog entry and docs about class delegation using the symbol :classCarlos Antonio da Silva2012-09-202-5/+36
* | | | Merge pull request #7721 from frodsan/ar_changelog_improvementSantiago Pastorino2012-09-201-7/+2
|\ \ \ \
| * | | | remove unnecessary entry and make minor edits to AR/CHANGELOG [ci skip]Francesco Rodriguez2012-09-201-7/+2
|/ / / /
* | | | Merge pull request #7613 from marcandre/delegate_to_classJeremy Kemper2012-09-202-0/+14
|\ \ \ \
| * | | | Nice and easy delegation to the classMarc-Andre Lafortune2012-09-112-0/+14
* | | | | Merge pull request #7720 from frodsan/rename_ar_tagJon Leighton2012-09-206-14/+19
|\ \ \ \ \
| * | | | | rename AR::Model::Tag to AR::Tag - fixes #7714Francesco Rodriguez2012-09-206-14/+19
* | | | | | Merge pull request #7719 from frodsan/strong_params_docs_part_twoRafael Mendonça França2012-09-203-15/+30
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | add :nodoc: to AMo::DeprecatedMassAssignmentSecurity::ClassMethods [ci skip]Francesco Rodriguez2012-09-201-3/+3
| * | | | | change AMo::ForbiddenAttributesProtection#sanitize_for_mass_assignment to pro...Francesco Rodriguez2012-09-201-7/+8
| * | | | | update AMo::ForbiddenAttributesError documentation [ci skip]Francesco Rodriguez2012-09-201-0/+12
| * | | | | fix typos and improve AC::StrongParameters documentation [ci skip]Francesco Rodriguez2012-09-201-6/+8
| * | | | | add :nodoc: directives to AMo::DeprecatedMassAssignmentSecurity [ci skip]Francesco Rodriguez2012-09-201-3/+3
|/ / / / /
* | | | | Remove the environment variables in the GemfileRafael Mendonça França2012-09-201-27/+7
* | | | | Freeze columns only once per ResultSantiago Pastorino2012-09-201-6/+9
* | | | | Merge pull request #7703 from kennyj/fix_6962Rafael Mendonça França2012-09-202-1/+12
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and %::z for...kennyj2012-09-202-1/+12
* | | | | Freeze columns just before using them as hash keysSantiago Pastorino2012-09-201-2/+5
* | | | | Merge pull request #7631 from jeremyevans/patch-1Aaron Patterson2012-09-191-1/+1
|\ \ \ \ \
| * | | | | Freeze columns before using them as hash keysJeremy Evans2012-09-131-1/+1
* | | | | | 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
|\ \ \ \ \ \ | |/ / / / / |/| | | | |