aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Don't html-escape the :count option to translate if it's a Numeric. Fixes #3685.Jon Leighton2011-11-193-2/+21
|
* Bump sprockets to 2.1.1Jon Leighton2011-11-191-1/+1
|
* Merge pull request #3687 from kennyj/fix_3678-2Jon Leighton2011-11-192-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 ↵kennyj2011-11-192-21/+3
| | | | | | | | performance problem (GH #3678)
* | Verify that #3690 has been closed by previous changes to the mysqlJon Leighton2011-11-193-2/+14
| | | | | | | | | | | | | | | | adapters. These tests fail on the v3.1.2 tag. Closes #3690.
* | Merge pull request #3689 from arunagw/warning_removed_actionpackYehuda Katz2011-11-181-1/+1
|\ \ | |/ |/| Warning removed for shadowing variable
| * Warning removed for shadowing variableArun Agrawal2011-11-191-1/+1
|/
* Revert "make sure to require the right deprecation warning file"Aaron Patterson2011-11-181-1/+0
| | | | This reverts commit 9d725e3df502a07222f35576108eb2df2bd88259.
* Refactoring the redirect method for the router api.Aaron Patterson2011-11-182-25/+24
|
* moving redirection to objectsAaron Patterson2011-11-181-45/+58
|
* remove the :path feature to redirects, since it cannot workAaron Patterson2011-11-182-48/+7
|
* make sure to require the right deprecation warning fileAaron Patterson2011-11-181-0/+1
|
* arity check has been pushed up, so no need for proc wrappingAaron Patterson2011-11-181-1/+1
|
* require that all blocks have arity of 2Aaron Patterson2011-11-182-6/+11
|
* copy options keys to the right place so that undo will work correctlyAaron Patterson2011-11-181-10/+4
|
* no need for type checkingAaron Patterson2011-11-181-1/+1
|
* cleaning up variable names to match method parameter namesAaron Patterson2011-11-181-6/+8
|
* stop doing is_a? checks on the resource typeAaron Patterson2011-11-181-4/+4
|
* move constants to methods since nothing else is using themAaron Patterson2011-11-181-6/+5
|
* pushing hash validation upAaron Patterson2011-11-181-13/+14
|
* breaking match down to smaller methodsAaron Patterson2011-11-181-19/+22
|
* some refactoring of the match methodAaron Patterson2011-11-181-25/+17
|
* mailer guide - update info about using default host. Fixes #3642Vijay Dev2011-11-191-11/+4
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-186-13/+14
|\
| * remove unneeded params from issue tracker urlVijay Dev2011-11-181-1/+1
| |
| * put back the removed egVijay Dev2011-11-181-0/+1
| |
| * Fixed typo: expect -> expectedPhilip Arndt2011-11-181-1/+1
| |
| * Fix a number_with_delimiter :separator exampleEdward Anderson2011-11-171-1/+1
| |
| * Guides: better example to find the last sent emailSunny Ripert2011-11-171-1/+1
| |
| * "denoted" instead of "donated"capps2011-11-161-1/+1
| | | | | | "parentheses" instead of "use brackets"
| * added commarpq2011-11-151-1/+1
| |
| * made url to a github issues a bit shorter - no need in a page param when ↵Sergey Parizhskiy2011-11-151-1/+1
| | | | | | | | it's a first page
| * Move tooltip on re-running rails new with a different --database optionJason Noble2011-11-131-8/+8
| |
* | Merge pull request #3683 from christos/schema_introspection_speedupAaron Patterson2011-11-182-1/+10
|\ \ | | | | | | Only used detailed schema introspection when doing a schema dump.
| * | Only used detailed schema introspection when doing a schema dump.Christos Zisopoulos2011-11-182-1/+10
| | | | | | | | | Fixes #3678
* | | Merge pull request #3681 from sikachu/fix_test_variableVijay Dev2011-11-183-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 testingPrem Sichanugrist2011-11-183-24/+24
|/ /
* | Merge pull request #3680 from rubys/masterJon Leighton2011-11-181-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 dbSam Ruby2011-11-181-2/+2
|/ / | | | | | | Fix regression introduced by 38d26b0cb56d82093889efa95992a35ba3bb9f29
* | Merge pull request #3666 from oscardelben/databases_rake_cleanupVijay Dev2011-11-181-8/+9
|\ \ | | | | | | Cleanup of databases.rake psql env variables
| * | Cleanup of databases.rake psql env variablesOscar Del Ben2011-11-171-8/+9
| | |
* | | release instructions: new section about docs generationXavier Noria2011-11-181-0/+31
| | |
* | | Merge pull request #3669 from parndt/patch-1Vijay Dev2011-11-171-1/+1
|\ \ \ | | | | | | | | Fixed typo: expect -> expected
| * | | Fixed typo: expect -> expectedPhilip Arndt2011-11-181-1/+1
| | | |
* | | | _html translation should escape interpolated argumentslest2011-11-173-4/+29
| | | |
* | | | Revert "warn the user values are directly interpolated into _html ↵Xavier Noria2011-11-172-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.
* | | | allow people to set a local .Gemfile so that things like ruby-debug are not ↵Aaron Patterson2011-11-172-5/+3
| | | | | | | | | | | | | | | | required for regular development
* | | | warn the user values are directly interpolated into _html translation stringsXavier Noria2011-11-172-0/+14
|/ / /
* | | update guide: db:structure:dump produces structure.sql nowVijay Dev2011-11-181-1/+1
| | |
* | | Revert "Merge pull request #1163 from amatsuda/sexier_migration_31"Aaron Patterson2011-11-174-142/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0e407a90413d8a19002b85508d811ccdf2190783, reversing changes made to 533a9f84b035756eedf9fdccf0c494dc9701ba72. Conflicts: activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb activerecord/test/cases/migration_test.rb