aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'docrails/master'Xavier Noria2010-06-125-5/+13
|\
| * adds missing require for having ActiveSupport::InheritableOptions definedXavier Noria2010-06-111-0/+1
| * Updated all number helpers with :locale option.Slobodan Kovacevic2010-06-111-1/+9
| * grammar fixesXavier Noria2010-06-112-2/+2
| * fixing typoNeeraj Singh2010-06-101-1/+1
| * Fix spelling error in ActiveModel::Conversion docs. [#4826 state:resolved]Pavel Gorbokon2010-06-111-1/+1
* | AS guide: updates docs on date calculations to reflect a0a6cc2Xavier Noria2010-06-121-5/+21
* | Date#since, #ago, #beginning_of_day, #end_of_day, #xmlschema return TimeWithZ...Geoff Buesing2010-06-123-6/+65
* | Single ruby version requirement messageJeremy Kemper2010-06-112-10/+5
* | Ruby 1.9.1 compat: constant lookupJeremy Kemper2010-06-111-1/+1
* | Remove String#constantize depsJeremy Kemper2010-06-112-8/+9
* | Explicitly delegate Chars#<=> to work around Kernel#<=> possibly ignoring met...Jeremy Kemper2010-06-111-3/+4
* | Revert "Don't overwrite unsaved updates when loading an association but prese...José Valim2010-06-113-17/+3
* | text_helper now escape the unsafe input instead of sanitizingSantiago Pastorino2010-06-112-13/+12
* | Added tests for cookies with domain option.Rizwan Reza2010-06-111-0/+22
* | Moved test/controller/cookie_test.rb to test/dispatch/cookies_test.rbRizwan Reza2010-06-111-2/+2
* | Refactored duplication into a separate method. Dropped class variable.Rizwan Reza2010-06-111-15/+17
* | Adding missing docs to delete cookies with :all which were added that way.Rizwan Reza2010-06-111-1/+2
* | Took out the domain option logic to cookies.rb.Rizwan Reza2010-06-113-22/+32
* | Moved Domain regexp to a constant and added comments.Rizwan Reza2010-06-111-1/+8
* | The previous commit didn't work with complex domains, which is now fixed.Rizwan Reza2010-06-112-9/+9
* | Add support for multi-subdomain session by setting cookie host in session coo...Rizwan Reza2010-06-114-2/+47
* | adds missing require for having ActiveSupport::InheritableOptions definedXavier Noria2010-06-111-0/+1
|/
* Merge remote branch 'rails/master'Xavier Noria2010-06-1061-513/+949
|\
| * abort generation/booting on Ruby 1.9.1Xavier Noria2010-06-105-4/+13
| * layout 'application' is not anymore on application_controllerSantiago Pastorino2010-06-101-2/+1
| * detect being inside a rails application even from a subdirectoryChad Fowler2010-06-104-19/+56
| * Revert "Add support for multi-subdomain session by setting cookie host in ses...José Valim2010-06-104-47/+2
| * Rails::Generators::GeneratedAttribute: tests, cleanups and a bugfix [#4631 st...Jeff Kreeftmeijer2010-06-103-19/+105
| * Missing method error doesn't specify which controller it is missing from [#44...Alan Harper2010-06-102-2/+11
| * Remove punctuate_body! No code in lib was using it and it had no documentation.José Valim2010-06-102-31/+0
| * class_attribute is not a direct replacement of class_inheritable_*.José Valim2010-06-105-21/+29
| * Add support for multi-subdomain session by setting cookie host in session coo...Guillermo Álvarez2010-06-104-1/+48
| * Validators should at model level and not at AR:Base level [Closes #4804]Neeraj Singh2010-06-102-1/+11
| * Cut down even further on rake -T noiseDavid Heinemeier Hansson2010-06-094-36/+91
| * Ensure show exceptions middleware properly filters backtrace before logging.José Valim2010-06-092-1/+21
| * Silence even more noisy rake task docsDavid Heinemeier Hansson2010-06-091-12/+12
| * Cut down on tasks shown in rake -TDavid Heinemeier Hansson2010-06-095-21/+21
| * Remove outdated section on web servers that didnt really tell you much anywayDavid Heinemeier Hansson2010-06-091-26/+1
| * Remove needless links and search box and update doc linksDavid Heinemeier Hansson2010-06-091-17/+0
| * You dont have to manually mention the application layout, its automatically usedDavid Heinemeier Hansson2010-06-091-1/+0
| * Don't overwrite unsaved updates when loading an association but preserve the ...James Le Cuirot2010-06-093-3/+17
| * Make sure about which is the first element of the query, fixes a postgresql 8...Santiago Pastorino2010-06-091-2/+2
| * Should call configure! to initiliaze the applicationSantiago Pastorino2010-06-091-0/+1
| * SQLite2Adapter doesn't existSantiago Pastorino2010-06-091-1/+1
| * Removed textilize, textilize_without_paragraph and markdown helpersSantiago Pastorino2010-06-094-195/+2
| * Better test for ticket [#3914 state:resolved]Neeraj Singh2010-06-091-0/+11
| * Merge branch 'master' of github.com:rails/railswycats2010-06-0824-114/+667
| |\
| | * Add more cases to previous commit [#4394 state:resolved]José Valim2010-06-082-3/+10
| | * Make sure namespaces are nested within resourcesJan De Poorter2010-06-082-0/+23