Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Improve delegate list to avoid method missing. | José Valim | 2011-12-15 | 1 | -1/+2 |
| | |||||
* | Fix diagnostics page for routing errors. | José Valim | 2011-12-15 | 6 | -16/+28 |
| | |||||
* | Clean up the cache before the request in case we are running in the ↵ | José Valim | 2011-12-15 | 5 | -12/+66 |
| | | | | reload_classes_only_on_change schema. | ||||
* | There isn't a column_hash. It was being invoked by method missing. | José Valim | 2011-12-15 | 1 | -1/+1 |
| | |||||
* | Fix #3987. | Jon Leighton | 2011-12-15 | 2 | -0/+12 |
| | |||||
* | Merge pull request #3994 from whilefalse/sass_cache_gitignore | José Valim | 2011-12-15 | 1 | -1/+2 |
|\ | | | | | Added .sass-cache/ directory to the genrated gitignore in engines. | ||||
| * | Added .sass-cache/ directory to the genrated gitignore in engines. | Steven Anderson | 2011-12-15 | 1 | -1/+2 |
| | | |||||
* | | Merge pull request #3991 from akaspick/attrfix | Jon Leighton | 2011-12-15 | 4 | -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 Kaspick | 2011-12-14 | 4 | -2/+22 |
| | | | | | | | | object. Fixes a regression from 3.0.x | ||||
* | | Merge pull request #3990 from ugisozols/master | José Valim | 2011-12-14 | 1 | -1/+0 |
|\ \ | | | | | | | Remove autoload for non-existent file | ||||
| * | | Remove autoload for non-existent file. | Uģis Ozols | 2011-12-15 | 1 | -1/+0 |
|/ / | |||||
* / | seed file was already tested for existence. ಠ_ಠ | Aaron Patterson | 2011-12-14 | 1 | -1/+1 |
|/ | |||||
* | updating arel and journey dependencies | Aaron Patterson | 2011-12-14 | 3 | -4/+4 |
| | |||||
* | let sdoc say which version of rdoc we depend on | Xavier Noria | 2011-12-14 | 1 | -1/+0 |
| | |||||
* | Merge pull request #3988 from lest/fix-date-select | José Valim | 2011-12-14 | 2 | -1/+21 |
|\ | | | | | fix separator insertion in date_select helper | ||||
| * | fix separator insertion in date_select helper | Sergey Nartimov | 2011-12-14 | 2 | -1/+21 |
|/ | |||||
* | Fix #3672 again (dependent: delete_all perf) | Jon Leighton | 2011-12-14 | 6 | -9/+26 |
| | |||||
* | Remove that there copy/pasted code :bomb: | Jon Leighton | 2011-12-14 | 1 | -5/+0 |
| | |||||
* | Don't try to autosave nested assocs. Fixes #2961. | Jon Leighton | 2011-12-14 | 3 | -1/+19 |
| | |||||
* | Cache column defaults on model. ~30% on Model.new due to avoiding repeatedly ↵ | Jon Leighton | 2011-12-14 | 1 | -2/+2 |
| | | | | fetching connection. | ||||
* | Avoid super; speeds up Model.new by about 12% | Jon Leighton | 2011-12-14 | 1 | -1/+1 |
| | |||||
* | Close the response body on cascade pass, closes #3975. | José Valim | 2011-12-14 | 2 | -3/+24 |
| | |||||
* | Stop the build asploding on 1.8.7 | Jon Leighton | 2011-12-14 | 2 | -0/+6 |
| | |||||
* | Merge pull request #3981 from choonkeat/master | Jeremy Kemper | 2011-12-14 | 2 | -1/+9 |
|\ | | | | | Fix url_for options[:subdomain] to allow objects as values | ||||
| * | Fix url_for options[:subdomain] to allow objects as values | choonkeat | 2011-12-14 | 2 | -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 Leighton | 2011-12-14 | 3 | -17/+26 |
|/ | |||||
* | Merge pull request #3979 from kommen/dbconsole_db_config | Piotr Sarnacki | 2011-12-14 | 1 | -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 Komendera | 2011-12-14 | 1 | -1/+1 |
|/ | |||||
* | Add return for 1.8.7 | Jon Leighton | 2011-12-14 | 1 | -1/+1 |
| | |||||
* | Unfluff the CI. | Jon Leighton | 2011-12-14 | 1 | -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é Valim | 2011-12-14 | 3 | -7/+9 |
| | |||||
* | Revert naive O(1) table_exists? implementation. | Jon Leighton | 2011-12-13 | 4 | -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 object | Aaron Patterson | 2011-12-13 | 1 | -0/+1 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-12-14 | 6 | -6/+6 |
|\ | |||||
| * | copy edits | Vijay Dev | 2011-12-14 | 1 | -1/+1 |
| | | |||||
| * | typo in textile markup | Mikhail Dieterle | 2011-12-14 | 1 | -1/+1 |
| | | |||||
| * | changed :finder_sql example to select * | clst | 2011-12-12 | 1 | -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 | clst | 2011-12-12 | 1 | -1/+1 |
| | | | | | | people.* will not work when the alias is named p | ||||
| * | disambiguate "and not" when explaining "&& return" | Suraj N. Kurapati | 2011-12-11 | 1 | -1/+1 |
| | | |||||
| * | Fixing typo in Routing Guide. | Ryan Sandridge | 2011-12-10 | 1 | -1/+1 |
| | | |||||
| * | Replacing vague mention of an unspecified section above with a link to the ↵ | Ryan Sandridge | 2011-12-08 | 1 | -1/+1 |
| | | | | | | | | actual section containing Asset Organization. | ||||
| * | Typo in list | Mikhail Dieterle | 2011-12-08 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #3970 from lest/backtrace-when-silenced | José Valim | 2011-12-13 | 2 | -1/+17 |
|\ \ | | | | | | | log exception backtrace when all backtrace lines silenced | ||||
| * | | log exception backtrace when all backtrace lines silenced | Sergey Nartimov | 2011-12-13 | 2 | -1/+17 |
| | | | |||||
* | | | locale and default_locale may be the same, so uniq the array | Aaron Patterson | 2011-12-13 | 1 | -1/+1 |
| | | | |||||
* | | | stop freezing the details hash | Aaron Patterson | 2011-12-13 | 1 | -2/+1 |
| | | | |||||
* | | | stop freezing hash value | Aaron Patterson | 2011-12-13 | 1 | -1/+1 |
|/ / | |||||
* | | Fix failing AP tests. | José Valim | 2011-12-13 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #3963 from lest/logger-missing-require | José Valim | 2011-12-13 | 1 | -0/+1 |
|\ \ | | | | | | | missing require in buffered logger | ||||
| * | | missing require in buffered logger | lest | 2011-12-13 | 1 | -0/+1 |
| | | |