Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Get rid of global variable in AR transactions test | Carlos Antonio da Silva | 2012-09-20 | 1 | -7/+7 |
| | |||||
* | Update delegate docs with new hash syntax [ci skip] | Carlos Antonio da Silva | 2012-09-20 | 1 | -10/+10 |
| | |||||
* | Add changelog entry and docs about class delegation using the symbol :class | Carlos Antonio da Silva | 2012-09-20 | 2 | -5/+36 |
| | | | | See #7613. [ci skip] | ||||
* | Merge pull request #7721 from frodsan/ar_changelog_improvement | Santiago Pastorino | 2012-09-20 | 1 | -7/+2 |
|\ | | | | | remove unnecessary entry and make minor edits to AR/CHANGELOG [ci skip] | ||||
| * | remove unnecessary entry and make minor edits to AR/CHANGELOG [ci skip] | Francesco Rodriguez | 2012-09-20 | 1 | -7/+2 |
|/ | |||||
* | Merge pull request #7613 from marcandre/delegate_to_class | Jeremy Kemper | 2012-09-20 | 2 | -0/+14 |
|\ | | | | | Nice and easy delegation to the class | ||||
| * | Nice and easy delegation to the class | Marc-Andre Lafortune | 2012-09-11 | 2 | -0/+14 |
| | | |||||
* | | Merge pull request #7720 from frodsan/rename_ar_tag | Jon Leighton | 2012-09-20 | 6 | -14/+19 |
|\ \ | | | | | | | rename AR::Model::Tag to AR::Tag | ||||
| * | | rename AR::Model::Tag to AR::Tag - fixes #7714 | Francesco Rodriguez | 2012-09-20 | 6 | -14/+19 |
| | | | |||||
* | | | Merge pull request #7719 from frodsan/strong_params_docs_part_two | Rafael Mendonça França | 2012-09-20 | 3 | -15/+30 |
|\ \ \ | |/ / |/| | | Strong Parameters documentation | ||||
| * | | add :nodoc: to AMo::DeprecatedMassAssignmentSecurity::ClassMethods [ci skip] | Francesco Rodriguez | 2012-09-20 | 1 | -3/+3 |
| | | | |||||
| * | | change AMo::ForbiddenAttributesProtection#sanitize_for_mass_assignment to ↵ | Francesco Rodriguez | 2012-09-20 | 1 | -7/+8 |
| | | | | | | | | | | | | protected | ||||
| * | | update AMo::ForbiddenAttributesError documentation [ci skip] | Francesco Rodriguez | 2012-09-20 | 1 | -0/+12 |
| | | | |||||
| * | | fix typos and improve AC::StrongParameters documentation [ci skip] | Francesco Rodriguez | 2012-09-20 | 1 | -6/+8 |
| | | | |||||
| * | | add :nodoc: directives to AMo::DeprecatedMassAssignmentSecurity [ci skip] | Francesco Rodriguez | 2012-09-20 | 1 | -3/+3 |
|/ / | |||||
* | | Remove the environment variables in the Gemfile | Rafael Mendonça França | 2012-09-20 | 1 | -27/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you want to set a local path for the gems you can use the local git repositories feature from the Bundler 1.2. For example to set the local arel repository: bundle config local.arel ~/Work/git/arel To unset it: bundle config --delete local.arel Bundler will check if the branch of you local repository is the same that specified in the Gemfile. If you want to disable these branch checks you can override it by setting this option: bundle config disable_local_branch_check true See more about this feature at http://gembundler.com/v1.2/git.html#local | ||||
* | | Freeze columns only once per Result | Santiago Pastorino | 2012-09-20 | 1 | -6/+9 |
| | | |||||
* | | Merge pull request #7703 from kennyj/fix_6962 | Rafael Mendonça França | 2012-09-20 | 2 | -1/+12 |
|\ \ | | | | | | | Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and %::z format strings. | ||||
| * | | Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and %::z ↵ | kennyj | 2012-09-20 | 2 | -1/+12 |
| | | | | | | | | | | | | format strings. | ||||
* | | | Freeze columns just before using them as hash keys | Santiago Pastorino | 2012-09-20 | 1 | -2/+5 |
| | | | |||||
* | | | Merge pull request #7631 from jeremyevans/patch-1 | Aaron Patterson | 2012-09-19 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Freeze columns before using them as hash keys | ||||
| * | | | Freeze columns before using them as hash keys | Jeremy Evans | 2012-09-13 | 1 | -1/+1 |
| | | | | | | | | | | | | This reduces the number of allocated strings from columns * (rows + 1) to just columns. | ||||
* | | | | Merge pull request #7702 from guilleiguaran/remove-manifest-option | Santiago Pastorino | 2012-09-19 | 5 | -13/+11 |
|\ \ \ \ | | | | | | | | | | | Remove highly uncommon `config.assets.manifest` option | ||||
| * | | | | Allow to use a local copy of sprockets-rails during development | Guillermo Iguaran | 2012-09-19 | 1 | -1/+6 |
| | | | | | |||||
| * | | | | 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 |