Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3695 from tobiassvn/partial_path_error | Yehuda Katz | 2011-11-19 | 2 | -2/+14 |
|\ | | | | | Meaningful errors for unexpected partial arguments. Fixes #3573 | ||||
| * | Meaningful errors for unexpected partial arguments. Fixes #3573 | Tobias Svensson | 2011-11-19 | 2 | -2/+14 |
| | | |||||
* | | Perf fix | Jon Leighton | 2011-11-19 | 2 | -2/+11 |
| | | | | | | | | | | | | | | If we're deleting all records in an association, don't add a IN(..) clause to the query. Fixes #3672. | ||||
* | | Add missing CHANGELOG entry for #3678. Closes #3678. | Jon Leighton | 2011-11-19 | 1 | -0/+4 |
| | | |||||
* | | Don't html-escape the :count option to translate if it's a Numeric. Fixes #3685. | Jon Leighton | 2011-11-19 | 3 | -2/+21 |
| | | |||||
* | | Bump sprockets to 2.1.1 | Jon Leighton | 2011-11-19 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #3687 from kennyj/fix_3678-2 | Jon Leighton | 2011-11-19 | 2 | -21/+3 |
|\ | | | | | Use `show index from`. We could fix `pk_and_sequence_for` method's performance problem (GH #3678) | ||||
| * | Use `show index from`. We could fix `pk_and_sequence_for` method's ↵ | kennyj | 2011-11-19 | 2 | -21/+3 |
| | | | | | | | | performance problem (GH #3678) | ||||
* | | Verify that #3690 has been closed by previous changes to the mysql | Jon Leighton | 2011-11-19 | 3 | -2/+14 |
| | | | | | | | | | | | | | | | | adapters. These tests fail on the v3.1.2 tag. Closes #3690. | ||||
* | | Merge pull request #3689 from arunagw/warning_removed_actionpack | Yehuda Katz | 2011-11-18 | 1 | -1/+1 |
|\ \ | |/ |/| | Warning removed for shadowing variable | ||||
| * | Warning removed for shadowing variable | Arun Agrawal | 2011-11-19 | 1 | -1/+1 |
|/ | |||||
* | Revert "make sure to require the right deprecation warning file" | Aaron Patterson | 2011-11-18 | 1 | -1/+0 |
| | | | | This reverts commit 9d725e3df502a07222f35576108eb2df2bd88259. | ||||
* | Refactoring the redirect method for the router api. | Aaron Patterson | 2011-11-18 | 2 | -25/+24 |
| | |||||
* | moving redirection to objects | Aaron Patterson | 2011-11-18 | 1 | -45/+58 |
| | |||||
* | remove the :path feature to redirects, since it cannot work | Aaron Patterson | 2011-11-18 | 2 | -48/+7 |
| | |||||
* | make sure to require the right deprecation warning file | Aaron Patterson | 2011-11-18 | 1 | -0/+1 |
| | |||||
* | arity check has been pushed up, so no need for proc wrapping | Aaron Patterson | 2011-11-18 | 1 | -1/+1 |
| | |||||
* | require that all blocks have arity of 2 | Aaron Patterson | 2011-11-18 | 2 | -6/+11 |
| | |||||
* | copy options keys to the right place so that undo will work correctly | Aaron Patterson | 2011-11-18 | 1 | -10/+4 |
| | |||||
* | no need for type checking | Aaron Patterson | 2011-11-18 | 1 | -1/+1 |
| | |||||
* | cleaning up variable names to match method parameter names | Aaron Patterson | 2011-11-18 | 1 | -6/+8 |
| | |||||
* | stop doing is_a? checks on the resource type | Aaron Patterson | 2011-11-18 | 1 | -4/+4 |
| | |||||
* | move constants to methods since nothing else is using them | Aaron Patterson | 2011-11-18 | 1 | -6/+5 |
| | |||||
* | pushing hash validation up | Aaron Patterson | 2011-11-18 | 1 | -13/+14 |
| | |||||
* | breaking match down to smaller methods | Aaron Patterson | 2011-11-18 | 1 | -19/+22 |
| | |||||
* | some refactoring of the match method | Aaron Patterson | 2011-11-18 | 1 | -25/+17 |
| | |||||
* | mailer guide - update info about using default host. Fixes #3642 | Vijay Dev | 2011-11-19 | 1 | -11/+4 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-11-18 | 6 | -13/+14 |
|\ | |||||
| * | remove unneeded params from issue tracker url | Vijay Dev | 2011-11-18 | 1 | -1/+1 |
| | | |||||
| * | put back the removed eg | Vijay Dev | 2011-11-18 | 1 | -0/+1 |
| | | |||||
| * | Fixed typo: expect -> expected | Philip Arndt | 2011-11-18 | 1 | -1/+1 |
| | | |||||
| * | Fix a number_with_delimiter :separator example | Edward Anderson | 2011-11-17 | 1 | -1/+1 |
| | | |||||
| * | Guides: better example to find the last sent email | Sunny Ripert | 2011-11-17 | 1 | -1/+1 |
| | | |||||
| * | "denoted" instead of "donated" | capps | 2011-11-16 | 1 | -1/+1 |
| | | | | | | "parentheses" instead of "use brackets" | ||||
| * | added comma | rpq | 2011-11-15 | 1 | -1/+1 |
| | | |||||
| * | made url to a github issues a bit shorter - no need in a page param when ↵ | Sergey Parizhskiy | 2011-11-15 | 1 | -1/+1 |
| | | | | | | | | it's a first page | ||||
| * | Move tooltip on re-running rails new with a different --database option | Jason Noble | 2011-11-13 | 1 | -8/+8 |
| | | |||||
* | | Merge pull request #3683 from christos/schema_introspection_speedup | Aaron Patterson | 2011-11-18 | 2 | -1/+10 |
|\ \ | | | | | | | Only used detailed schema introspection when doing a schema dump. | ||||
| * | | Only used detailed schema introspection when doing a schema dump. | Christos Zisopoulos | 2011-11-18 | 2 | -1/+10 |
| | | | | | | | | | Fixes #3678 | ||||
* | | | Merge pull request #3681 from sikachu/fix_test_variable | Vijay Dev | 2011-11-18 | 3 | -24/+24 |
|\ \ \ | |/ / |/| | | Update variable's name in the test case to reflect the class we're testing | ||||
| * | | Update variable's name in the test case to reflect the class we're testing | Prem Sichanugrist | 2011-11-18 | 3 | -24/+24 |
|/ / | |||||
* | | Merge pull request #3680 from rubys/master | Jon Leighton | 2011-11-18 | 1 | -2/+2 |
|\ \ | | | | | | | This fix causes the AWDwR test to go back to being green on Rails master. | ||||
| * | | Stop db:seed from performing a reload of the db | Sam Ruby | 2011-11-18 | 1 | -2/+2 |
|/ / | | | | | | | Fix regression introduced by 38d26b0cb56d82093889efa95992a35ba3bb9f29 | ||||
* | | Merge pull request #3666 from oscardelben/databases_rake_cleanup | Vijay Dev | 2011-11-18 | 1 | -8/+9 |
|\ \ | | | | | | | Cleanup of databases.rake psql env variables | ||||
| * | | Cleanup of databases.rake psql env variables | Oscar Del Ben | 2011-11-17 | 1 | -8/+9 |
| | | | |||||
* | | | release instructions: new section about docs generation | Xavier Noria | 2011-11-18 | 1 | -0/+31 |
| | | | |||||
* | | | Merge pull request #3669 from parndt/patch-1 | Vijay Dev | 2011-11-17 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fixed typo: expect -> expected | ||||
| * | | | Fixed typo: expect -> expected | Philip Arndt | 2011-11-18 | 1 | -1/+1 |
| | | | | |||||
* | | | | _html translation should escape interpolated arguments | lest | 2011-11-17 | 3 | -4/+29 |
| | | | | |||||
* | | | | Revert "warn the user values are directly interpolated into _html ↵ | Xavier Noria | 2011-11-17 | 2 | -14/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translation strings" Reason: After another round of discussion, it has been decided to let interpolation deal with unsafe strings as it should do. This reverts commit d57d8098fc269a26ea0051a9027a33af1a9a4b2b. |