aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Squash commits into a single commitAvi Tzurel2012-03-111-0/+2
* Fix comment about layout folders lookupAlexey Vakhov2012-03-091-2/+2
* Document validations and callbacks Array support for :if and :unless optionsJoão Britto2012-03-091-2/+16
* Close string quotesJoão Britto2012-03-091-1/+1
* Additional preamble comments in form_helper.rb.Mark Thomson2012-03-081-7/+18
* Small correction to the description of the role of the form builder.Mark Thomson2012-03-081-1/+1
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-0911-30/+81
|\
| * Revert "Add rails glossary of common terms & concepts"Vijay Dev2012-03-082-428/+0
| * copy edits [ci skip]Vijay Dev2012-03-071-2/+2
| * Merge pull request #88 from kevingriffin/masterVijay Dev2012-03-071-5/+5
| |\
| | * Correct it's/its usage.Kevin Griffin2012-03-061-5/+5
| * | Improve docs for attr_accessible|protected related to Hash#except|sliceCarlos Antonio da Silva2012-03-061-8/+10
| * | Add some docs for ActionController::Base.without_modulesCarlos Antonio da Silva2012-03-061-0/+10
| * | Left off a : when specifying the :namespace option for a :controllercoreyhaines2012-03-061-1/+1
| * | In a nested resource route, the parent resource param is <resource_name>_idcoreyhaines2012-03-061-8/+8
| |/
| * Merge pull request #86 from bschaeffer/ar-doc-fixVijay Dev2012-03-061-2/+2
| |\
| | * Fix doc examples for has_and_belongs_to_many associationBraden Schaeffer2012-03-051-2/+2
| * | Fix typo in isolated engine docsCaius Durling2012-03-061-1/+1
| * | [instrumentation guide] Add introduction + basic outlineRyan Bigg2012-03-051-0/+39
| * | Merge branch 'master' of github.com:lifo/docrailsadman652012-03-051-1/+1
| |\ \
| | * | Fix typo in asset pipeline guideMatthew Conway2012-03-051-1/+1
| | |/
| * / Add rails glossary of common terms & conceptsadman652012-03-052-0/+428
| |/
| * Fixed a slightly misleading equivalent SQL code on the 3.2 query interface.Swanand Pagnis2012-03-051-1/+1
| * Bump "latest version" from 3.2.1 to 3.2.2 in upgrading rails guideCarlos Antonio da Silva2012-03-041-2/+2
| * typoMikhail Dieterle2012-03-041-1/+1
* | Merge pull request #5287 from nashby/hash-slice-extractAaron Patterson2012-03-082-8/+11
|\ \
| * | refactor Hash#slice and Hash#extract!Vasiliy Ermolovich2012-03-062-8/+11
* | | Merge pull request #5306 from kennyj/fix_69c7f02José Valim2012-03-082-2/+2
|\ \ \
| * | | Change the string to use in test case.kennyj2012-03-072-2/+2
* | | | Merge pull request #5336 from kennyj/fix_wrong_extensionXavier Noria2012-03-081-1/+1
|\ \ \ \
| * | | | Update CHANGELOG to fix wrong extension.kennyj2012-03-081-1/+1
|/ / / /
* | | | Merge pull request #5289 from rafaelfranca/fix-through-associationsJon Leighton2012-03-086-8/+43
|\ \ \ \
| * | | | Not need to pass join attributes to association buildRafael Mendonça França2012-03-075-16/+21
| * | | | Add test case to has_many through association when mass_assignment_sanitizer isRafael Mendonça França2012-03-054-4/+34
* | | | | Merge pull request #5162 from kennyj/schema_cache_dumpAaron Patterson2012-03-079-18/+173
|\ \ \ \ \
| * | | | | Add entry for schema cache dump to CHANGELOG.md.kennyj2012-03-011-0/+23
| * | | | | Support judgement expired schema cache dump.kennyj2012-03-013-4/+25
| * | | | | Load db/schema_cache.dump duaring boot time.kennyj2012-03-015-3/+32
| * | | | | Add db:schema:cache:dump and db:schema:cache:clear tasks.kennyj2012-03-013-0/+47
| * | | | | Add support schema cache dump and load.kennyj2012-03-012-14/+49
* | | | | | Revert "let the connection pool of new applications have size 1 rather than 5"Xavier Noria2012-03-074-36/+12
* | | | | | Revert "updates the new default pool size in some additional places"Xavier Noria2012-03-073-17/+7
* | | | | | Add tests to test that through associations are not readonly, and we can upda...kuahyeow2012-03-081-0/+11
* | | | | | Merge pull request #5315 from travisjeffery/enhance_postgresql_adapter_schema...Aaron Patterson2012-03-072-2/+62
|\ \ \ \ \ \
| * | | | | | Adds #create/drop_schema on the PostgreSQL Adapter.Travis Jeffery2012-03-072-2/+47
| * | | | | | Add #schema_names to PostgreSQL Adapter.Travis Jeffery2012-03-072-0/+15
* | | | | | | Merge pull request #5316 from Jacobkg/masterJosé Valim2012-03-072-1/+4
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | attribute_present? should return false for empty stringsJacob Green2012-03-062-1/+4
* | | | | | | Set the rendered_format on respond_to.José Valim2012-03-071-0/+1
* | | | | | | Just change the formats on first render, closes #5307, closes #5308.José Valim2012-03-071-2/+7