aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix #3987.Jon Leighton2011-12-152-0/+12
* Merge pull request #3994 from whilefalse/sass_cache_gitignoreJosé Valim2011-12-151-1/+2
|\
| * Added .sass-cache/ directory to the genrated gitignore in engines.Steven Anderson2011-12-151-1/+2
* | Merge pull request #3991 from akaspick/attrfixJon Leighton2011-12-154-2/+22
|\ \ | |/ |/|
| * Allow nested attributes in associations to update values in it's owner object...Andrew Kaspick2011-12-144-2/+22
* | Merge pull request #3990 from ugisozols/masterJosé Valim2011-12-141-1/+0
|\ \
| * | Remove autoload for non-existent file.Uģis Ozols2011-12-151-1/+0
|/ /
* / seed file was already tested for existence. ಠ_ಠAaron Patterson2011-12-141-1/+1
|/
* updating arel and journey dependenciesAaron Patterson2011-12-143-4/+4
* let sdoc say which version of rdoc we depend onXavier Noria2011-12-141-1/+0
* Merge pull request #3988 from lest/fix-date-selectJosé Valim2011-12-142-1/+21
|\
| * fix separator insertion in date_select helperSergey Nartimov2011-12-142-1/+21
|/
* Fix #3672 again (dependent: delete_all perf)Jon Leighton2011-12-146-9/+26
* Remove that there copy/pasted code :bomb:Jon Leighton2011-12-141-5/+0
* Don't try to autosave nested assocs. Fixes #2961.Jon Leighton2011-12-143-1/+19
* Cache column defaults on model. ~30% on Model.new due to avoiding repeatedly ...Jon Leighton2011-12-141-2/+2
* Avoid super; speeds up Model.new by about 12%Jon Leighton2011-12-141-1/+1
* Close the response body on cascade pass, closes #3975.José Valim2011-12-142-3/+24
* Stop the build asploding on 1.8.7Jon Leighton2011-12-142-0/+6
* Merge pull request #3981 from choonkeat/masterJeremy Kemper2011-12-142-1/+9
|\
| * Fix url_for options[:subdomain] to allow objects as valueschoonkeat2011-12-142-1/+9
* | Use a separate module for 'external' attribute methods.Jon Leighton2011-12-143-17/+26
|/
* Merge pull request #3979 from kommen/dbconsole_db_configPiotr Sarnacki2011-12-141-1/+1
|\
| * dbconsole: Use the app's database_configuration instead of duplicating code.Dieter Komendera2011-12-141-1/+1
|/
* Add return for 1.8.7Jon Leighton2011-12-141-1/+1
* Unfluff the CI.Jon Leighton2011-12-141-1/+1
* Clean up details keys before some tests to expire the cache.José Valim2011-12-143-7/+9
* Revert naive O(1) table_exists? implementation.Jon Leighton2011-12-134-12/+16
* dup the details hash if a key has already been set for this objectAaron Patterson2011-12-131-0/+1
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-12-146-6/+6
|\
| * copy editsVijay Dev2011-12-141-1/+1
| * typo in textile markupMikhail Dieterle2011-12-141-1/+1
| * changed :finder_sql example to select * clst2011-12-121-1/+1
| * fixed example for :finder_sql clst2011-12-121-1/+1
| * disambiguate "and not" when explaining "&& return"Suraj N. Kurapati2011-12-111-1/+1
| * Fixing typo in Routing Guide.Ryan Sandridge2011-12-101-1/+1
| * Replacing vague mention of an unspecified section above with a link to the ac...Ryan Sandridge2011-12-081-1/+1
| * Typo in listMikhail Dieterle2011-12-081-1/+1
* | Merge pull request #3970 from lest/backtrace-when-silencedJosé Valim2011-12-132-1/+17
|\ \
| * | log exception backtrace when all backtrace lines silencedSergey Nartimov2011-12-132-1/+17
* | | locale and default_locale may be the same, so uniq the arrayAaron Patterson2011-12-131-1/+1
* | | stop freezing the details hashAaron Patterson2011-12-131-2/+1
* | | stop freezing hash valueAaron Patterson2011-12-131-1/+1
|/ /
* | Fix failing AP tests.José Valim2011-12-131-1/+1
* | Merge pull request #3963 from lest/logger-missing-requireJosé Valim2011-12-131-0/+1
|\ \
| * | missing require in buffered loggerlest2011-12-131-0/+1
* | | FileUpdateChecker should be able to handle deleted files.José Valim2011-12-138-61/+109
* | | Clean up FileUpdateChecker API.José Valim2011-12-135-20/+25
|/ /
* | Move hooks back to initializers (we need an API that allows hooks to be repla...José Valim2011-12-132-36/+21
* | Add config.file_watcher so developers can provide their own watchers (for ins...José Valim2011-12-134-8/+87