aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make with_scope public so we stop using send :bomb:José Valim2011-12-153-91/+104
|
* Merge pull request #3998 from rafacv/masterXavier Noria2011-12-151-1/+1
|\ | | | | Small typo in Rails::Engine documentation
| * Fixed small typo in the Rails::Engine documentation.Rafael Valverde2011-12-151-1/+1
| |
* | Improve delegate list to avoid method missing.José Valim2011-12-151-1/+2
|/
* Fix diagnostics page for routing errors.José Valim2011-12-156-16/+28
|
* Clean up the cache before the request in case we are running in the ↵José Valim2011-12-155-12/+66
| | | | reload_classes_only_on_change schema.
* There isn't a column_hash. It was being invoked by method missing.José Valim2011-12-151-1/+1
|
* 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.
| * 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 o...
| * Allow nested attributes in associations to update values in it's owner ↵Andrew Kaspick2011-12-144-2/+22
| | | | | | | | object. Fixes a regression from 3.0.x
* | Merge pull request #3990 from ugisozols/masterJosé Valim2011-12-141-1/+0
|\ \ | | | | | | Remove autoload for non-existent file
| * | 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 helper
| * 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
| | | | fetching connection.
* 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 values
| * Fix url_for options[:subdomain] to allow objects as valueschoonkeat2011-12-142-1/+9
| | | | | | | | * e.g. blog_url(subdomain: current_user) instead of blog_url(subdomain: current_user.to_param)
* | 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 loading code.
| * 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
| | | | | | | | | | | | | | | With transactional fixtures enabled, the session records would end up in @_current_transaction_records, and at the end of the transaction, methods would be called on them that would trigger method_missing and trigger attribute methods to be generated. However, at this point the sessions table would not exist, and the columns were not cached, so an exception would be raised because we can't find the columns to generate attribute methods for. Not sure exactly why this didn't crop up before but there have been changes to the schema cache code and perhaps that means that column data that was cached previously at that point is now uncached.
* 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
| | | | | | | | | | It was a bad idea to rescue exceptions here. This can interfere with transaction rollbacks which seems to be the cause of current CI failure. Instead, each adapter should implement its own DB-specific O(1) implementation, and we fall back on the generic, slower, implementation otherwise.
* 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
| | | | | | because with select p.* you can no longer use count(). Using count will result in an SQL error message.
| * fixed example for :finder_sql clst2011-12-121-1/+1
| | | | | | people.* will not work when the alias is named p
| * 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 ↵Ryan Sandridge2011-12-081-1/+1
| | | | | | | | actual section containing Asset Organization.
| * 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 silenced
| * | 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
|/ /