aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* rename AR::Model::Tag to AR::Tag - fixes #7714Francesco Rodriguez2012-09-206-14/+19
|
* Remove the environment variables in the GemfileRafael Mendonça França2012-09-201-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 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 format strings.
| * Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and %::z ↵kennyj2012-09-202-1/+12
| | | | | | | | format strings.
* | 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 keys
| * | Freeze columns before using them as hash keysJeremy Evans2012-09-131-1/+1
| | | | | | | | | This reduces the number of allocated strings from columns * (rows + 1) to just columns.
* | | Merge pull request #7702 from guilleiguaran/remove-manifest-optionSantiago Pastorino2012-09-195-13/+11
|\ \ \ | | | | | | | | Remove highly uncommon `config.assets.manifest` option
| * | | 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 ↵Guillermo Iguaran2012-09-194-12/+5
| | | | | | | | | | | | | | | | | | | | | | | | manifest path. This option is now unsupported in sprockets-rails.
* | | | Merge pull request #7692 from frodsan/strong_params_docsSantiago Pastorino2012-09-193-14/+225
|\ \ \ \ | | | | | | | | | | update docs for strong parameters merge
| * | | | 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_attributes
| * | | | 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 Broken Link in ActiveRecord Transaction Documentation [ci skip]
| * | | | 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 integration
| * | | | Update changelogs to add entries about strong_parameters integrationGuillermo Iguaran2012-09-194-0/+50
|/ / / /
* | | | extracts manual development dependencies installation to a new non-promoted ↵Xavier Noria2012-09-202-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 databaseJeremy Kemper2012-09-191-2/+2
| | | |
* | | | Revert "Make sure :environment task is executed before db:schema:load or ↵Jeremy Kemper2012-09-191-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-explicitlyRafael Mendonça França2012-09-191-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 Iguaran2012-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | config.action_controller.permit_all_parameters is not present
* | | | | 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 hash
| * | | fix querying with an empty hashDamien Mathieu2012-09-193-3/+18
| | | | | | | | | | | | | | | | Closes #6960
* | | | Merge pull request #7482 from route/syncing_tests_for_sprocketsRafael Mendonça França2012-09-192-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 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 to fix #6497
| * | | Removing to_shorthand from default_controller_and_action. Fixes #6497Luiz Felipe2012-09-193-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-cleanupsCarlos Antonio da Silva2012-09-191-5/+1
|\ \ \ | |/ / |/| | Minor cleanups missed during mass assignment options removal from AR
| * | Remove unused private method AR::NestedAttributes#unassignable_keys and ↵Guillermo Iguaran2012-09-191-5/+1
|/ / | | | | | | reference to mass_assignment options
* | Merge pull request #7694 from guilleiguaran/update-ar-docsRafael Mendonça França2012-09-182-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 Iguaran2012-09-181-11/+0
| | | | | | | | | | | | references to mass assignment options
| * | 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.
| * | Correct parameter access.Philip Arndt2012-09-191-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ç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 warning
| * | 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
|\ \ | | | | | | Integrate strong_parameters in Rails 4
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 14:27:32 +0000