aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5351 from shanna/masterJosé Valim2012-03-081-0/+1
|\ | | | | Missing active_model/naming.rb dependency.
| * Added missing ActiveModel::Naming dependency.Shane Hanna2012-03-091-0/+1
| | | | | | | | | | ActiveModel::Name constructor expects to be able to call #blank? on a String but the core Object#blank? extension is never required.
* | Minor changelog fixes [ci skip]Vijay Dev2012-03-091-1/+1
| |
* | Merge pull request #5349 from rafaelfranca/changelog-fixVijay Dev2012-03-087-10/+59
|\ \ | | | | | | Fix my name in the CHANGELOG to follow the convention
| * | Fix my name in the CHANGELOG to follow the conventionRafael Mendonça França2012-03-097-10/+59
| |/ | | | | | | Also add missing entries and use the formating convention
* | Merge pull request #5348 from rafaelfranca/fix-warningVijay Dev2012-03-081-1/+1
|\ \ | |/ |/| Remove warning of unused variable
| * Remove warning of unused variableRafael Mendonça França2012-03-081-1/+1
|/
* ensure that released connections move between threadsAaron Patterson2012-03-081-0/+18
|
* make active_connection? return true only if there is an open connection in ↵Aaron Patterson2012-03-082-7/+39
| | | | use for the current thread. fixes #5330
* fix incorrect changelog headings [ci skip].Vijay Dev2012-03-093-25/+27
| | | | Last commit message should not have said 'Rails 4' either
* changelog updates for Rails 4 [ci skip]Vijay Dev2012-03-094-1/+27
|
* 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
| | | | | | | | | | | | This reverts commit fd584a63deb8d2f1e8969d8527e7a9dbd9d68848. Reason: This is not suitable for a Rails guide in my opinion.
| * copy edits [ci skip]Vijay Dev2012-03-071-2/+2
| |
| * Merge pull request #88 from kevingriffin/masterVijay Dev2012-03-071-5/+5
| |\ | | | | | | Correct "its" usage for "AJAX on Rails" page
| | * 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
| | | | | | | | | | | | path segment
| * | 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 association
| | * 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!
| * | 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 message string to use in test case.
| * | | 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.
| * | | | 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
|\ \ \ \ | | | | | | | | | | Fix has_many through associations when mass_assignment_sanitizer is strict
| * | | | 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
| | | | | | | | | | | | | | | | | | | | :strict
* | | | | Merge pull request #5162 from kennyj/schema_cache_dumpAaron Patterson2012-03-079-18/+173
|\ \ \ \ \ | | | | | | | | | | | | [Proposal] Schema cache dump
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: Temporarily reverting this because it has uncovered an issue that prevents Sam's test suite from passing. This reverts commit 9b2c38b7bd582d9712c3779294a9bccde7bbd548.
* | | | | | Revert "updates the new default pool size in some additional places"Xavier Noria2012-03-073-17/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: We are about to temporarily revert the change to the default. This reverts commit 5c0aba238c37a71fce08f949bc2c6bdd9aab4f7b.
* | | | | | Add tests to test that through associations are not readonly, and we can ↵kuahyeow2012-03-081-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | update the records we retrive from the association
* | | | | | Merge pull request #5315 from ↵Aaron Patterson2012-03-072-2/+62
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | travisjeffery/enhance_postgresql_adapter_schema_support Enhance PostgreSQL Adapter schema support
| * | | | | | Adds #create/drop_schema on the PostgreSQL Adapter.Travis Jeffery2012-03-072-2/+47
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 16:36:19 +0000