aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* adds guides/.document to tell rdoc not to process this directoryXavier Noria2013-03-041-0/+0
* Merge pull request #9467 from senny/9459_include_json_root_out_of_syncRafael Mendonça França2013-03-043-34/+60
|\
| * `ActiveRecord::Base.include_root_in_json` is `false` by default.Yves Senn2013-03-042-1/+5
| * rewrite tests to have no side-effects on `include_root_in_json`.Yves Senn2013-03-041-33/+55
|/
* only calculate next_id when we need a new method definedAaron Patterson2013-03-041-1/+2
* Merge pull request #9541 from maximerety/fix_7774José Valim2013-03-042-1/+6
|\
| * Fix formats on xhr requests when HTTP_ACCEPT is empty stringmaximerety2013-03-042-1/+6
* | Merge pull request #9540 from dimko/patch-1Xavier Noria2013-03-041-3/+3
|\ \ | |/ |/|
| * Fixed typo in active record's changelogDimko2013-03-041-3/+3
|/
* Remove .all usage from unscope doc examples [ci skip]Carlos Antonio da Silva2013-03-041-4/+4
* Use 1.9 hash style in changelog and doc examples [ci skip]Carlos Antonio da Silva2013-03-042-6/+6
* Merge pull request #9537 from NARKOZ/patch-6Steve Klabnik2013-03-042-4/+6
|\
| * add prompt to 422 page to check logsNihad Abbasov2013-03-042-4/+6
|/
* Merge pull request #9200 from wangjohn/unscoping_activerecord_mergingJeremy Kemper2013-03-034-0/+275
|\
| * Created an unscope method for removing relations from a chain ofwangjohn2013-03-034-0/+275
* | Merge pull request #9532 from neerajdotname/fix-sql-in-exampleCarlos Antonio da Silva2013-03-031-1/+2
|\ \ | |/ |/|
| * fix the sql that is generated from scopingNeeraj Singh2013-03-031-1/+2
* | Bring config.allow_concurrency backJosé Valim2013-03-033-19/+48
* | Use custom visitor class for optimized url helpersAndrew White2013-03-034-9/+19
* | Merge pull request #9465 from senny/document_strong_params_in_ac_guideXavier Noria2013-03-031-0/+118
|\ \
| * | integrate the strong params README into the AC guide.Yves Senn2013-03-031-0/+118
|/ /
* | Merge pull request #9512 from Jacke/masterGuillermo Iguaran2013-03-028-67/+254
|\ \
| * | New beauty pages(404, 422, 500)Stanislav2013-03-028-67/+254
* | | Remove hard coded references to Active Record in railtiesJosé Valim2013-03-025-23/+11
* | | Merge pull request #9431 from troyk/patch-2Andrew White2013-03-023-4/+8
|\ \ \
| * | | Fix PostgreSQL TIMESTAMP WITH TIME ZONE to return ActiveSupport::TimeTroy Kruthoff2013-03-013-4/+8
| |/ /
* | | :scissors: extra blank lineAkira Matsuda2013-03-021-1/+0
* | | Merge pull request #9510 from senny/7364_warn_when_appending_prepending_to_an...Rafael Mendonça França2013-03-013-9/+32
|\ \ \
| * | | deal with `#append` and `#prepend` on association collections.Yves Senn2013-03-013-5/+28
| * | | don't use non-ascii ' chars in documentationYves Senn2013-03-011-4/+4
| |/ /
* / / Restore note about nested SCRIPT_NAME handling.Jeremy Kemper2013-03-011-0/+2
|/ /
* | Merge pull request #8652 from codeodor/create_table_migrationCarlos Antonio da Silva2013-03-016-7/+57
|\ \
| * | Support creating a table migration generatorSammy Larbi2013-03-016-7/+57
|/ /
* | Wordsmithing @trevorturk's upgrade notesJeremy Kemper2013-02-281-7/+4
* | Merge pull request #9495 from trevorturk/upgrade-guideJeremy Kemper2013-02-281-1/+69
|\ \
| * | Document introduction of ActionDispatch::ParamsParser::ParseErrorTrevor Turk2013-02-281-0/+2
| * | Document that scopes require a callable objectTrevor Turk2013-02-281-1/+9
| * | Document common deprecationsTrevor Turk2013-02-281-0/+11
| * | Document the deprecation of ActionView::RecordIdentifierTrevor Turk2013-02-281-0/+2
| * | Document ActiveRecord::Fixtures becoming ActiveRecord::FixtureSetTrevor Turk2013-02-281-0/+2
| * | Document change in routes using matchTrevor Turk2013-02-281-0/+13
| * | Document removal of assets:precompile:primaryTrevor Turk2013-02-281-0/+4
| * | Document sass-rails asset_url deprecationTrevor Turk2013-02-281-0/+4
| * | Document caveat from 5b3bb61 which fixed handling SCRIPT_NAME from within mou...Trevor Turk2013-02-281-0/+3
| * | Document rails-observers extractionTrevor Turk2013-02-281-0/+4
| * | Document the switch from memcache-client to dalliTrevor Turk2013-02-281-0/+2
| * | Improve docs for UpgradeSignatureToEncryptionCookieStoreTrevor Turk2013-02-281-1/+10
| * | Document extraction of actionpack-xml_parserTrevor Turk2013-02-281-0/+2
| * | Document introduction of the ActionController::UnknownFormat exceptionTrevor Turk2013-02-281-0/+2
* | | Improve the CHANGELOG entryRafael Mendonça França2013-02-281-2/+3