aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add docs for eager_laod and preloadOscar Del Ben2012-07-071-0/+10
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-07-0720-176/+258
|\
| * minor text change [ci skip]Vijay Dev2012-07-071-1/+1
| * Revert "Add nodoc to relation methods"Vijay Dev2012-07-071-22/+24
| * Add nodoc to relation methodsOscar Del Ben2012-07-061-24/+22
| * add :nodoc: to internal implementations of AM::Validator [ci skip]Francesco Rodriguez2012-07-062-3/+3
| * update ActiveModel::Serialization documentation [ci skip]Francesco Rodriguez2012-07-061-14/+36
| * Add order docsOscar Del Ben2012-07-051-0/+10
| * Add group documentationOscar Del Ben2012-07-051-0/+12
| * Add documentation for includesOscar Del Ben2012-07-051-0/+11
| * Update list of AR Relation methodsOscar Del Ben2012-07-051-10/+16
| * Bump query guide to latest versionOscar Del Ben2012-07-051-2/+0
| * fix syntax of AM::Validations::HelperMethods examples [ci skip]Francesco Rodriguez2012-07-054-6/+6
| * update ActiveModel::Validations::HelperMethods documentation [ci skip]Francesco Rodriguez2012-07-058-130/+141
| * update ActiveModel::Conversion documentation [ci skip]Francesco Rodriguez2012-07-041-3/+15
| * There is only task for installing migrations when using enginesWojciech Wnętrzak2012-07-041-2/+1
| * remove :nodoc: of AR::Scoping#unscoped [ci skip]Francesco Rodriguez2012-07-011-4/+4
| * Changed attr_accessible example to reflect grouped rolesLaknath2012-07-011-2/+4
| * ActionDispatch::ClosedError no longer is raised. See d142572567 for more info.Nick Howard2012-06-301-3/+0
| * use config.action_controller instead of ActionController::Base in example cod...Nick Howard2012-06-301-1/+1
| * fix AR::SchemaStatements#column_exists? example [ci skip]Francesco Rodriguez2012-06-301-1/+1
| * update AR::SchemaStatements#column_exists? documentation [ci skip]Francesco Rodriguez2012-06-301-2/+4
* | Refactor locked? method in query cacheCarlos Antonio da Silva2012-07-071-5/+2
* | Load all records in Relation#inspectJon Leighton2012-07-071-4/+1
* | Merge pull request #6938 from acapilleri/as_json_refactoringCarlos Antonio da Silva2012-07-071-2/+6
|\ \
| * | small refactoring of as_json methodAngelo Capilleri2012-07-031-2/+6
* | | Merge pull request #6838 from kennyj/added_registration_taskCarlos Antonio da Silva2012-07-072-7/+27
|\ \ \
| * | | Added a feature to add a database task. e.g. OracleDatabaseTaskskennyj2012-06-242-7/+27
* | | | Use "instance_accessor" for flash types class attributeCarlos Antonio da Silva2012-07-072-4/+3
* | | | fixup changelogJon Leighton2012-07-071-1/+1
* | | | Relation#inspect handles doesn't perform a new query on an already-loaded rel...Jon Leighton2012-07-072-2/+16
* | | | Simplify Relation#inspectJon Leighton2012-07-071-12/+3
* | | | Merge pull request #6992 from kennyj/improve_6977-2José Valim2012-07-074-14/+65
|\ \ \ \
| * | | | Added support add_flash_typeskennyj2012-07-074-14/+65
|/ / / /
* | | | Merge pull request #6993 from morgoth/engine-table-name-prefix-generator-fixJosé Valim2012-07-073-2/+14
|\ \ \ \
| * | | | Fixed generating namespaced table_name_prefix in enginesWojciech Wnętrzak2012-07-062-2/+2
| * | | | Added failing test for generating namespaced table_name_prefix in enginesWojciech Wnętrzak2012-07-061-0/+12
* | | | | Merge pull request #6996 from kennyj/remove_unused_code_20120707José Valim2012-07-071-4/+0
|\ \ \ \ \
| * | | | | Remove unused code.kennyj2012-07-071-4/+0
* | | | | | Merge pull request #6997 from kennyj/fix_stored_attributesJosé Valim2012-07-074-2/+16
|\ \ \ \ \ \
| * | | | | | Added *instance_writer: false* for stored/serialized attributes.kennyj2012-07-074-2/+16
| |/ / / / /
* | | | | | Update masterJosé Valim2012-07-071-0/+2
* | | | | | Merge pull request #6987 from dmathieu/limit_inspectJosé Valim2012-07-073-3/+22
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Limit the number of records in Relation#inspectDamien Mathieu2012-07-063-3/+22
| |/ / / /
* | | | | Fix failing AM test due to missing templateCarlos Antonio da Silva2012-07-061-1/+1
* | | | | Improve docs, changelog and release notes for Action Mailer default_options=Carlos Antonio da Silva2012-07-064-6/+14
* | | | | Merge pull request #6950 from paneq/default_from2Carlos Antonio da Silva2012-07-064-3/+21
|\ \ \ \ \
| * | | | | Introduce config.action_mailer.default_from=Robert Pankowecki2012-07-034-3/+21
* | | | | | Merge pull request #6995 from frodsan/update_test_helpCarlos Antonio da Silva2012-07-061-1/+4
|\ \ \ \ \ \
| * | | | | | update test_help to config properly turn natural language optionFrancesco Rodriguez2012-07-061-1/+4
| | |/ / / / | |/| | | |