aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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
| | * cache_sweeper yields blank outputNeeraj Singh2010-06-083-0/+10
| | * Make logic for after_commit and after_rollback :on option work like it does f...Brian Durand2010-06-081-18/+33
| | * Revert "Temporarily revert "Update after_commit and after_rollback docs and t...Jeremy Kemper2010-06-085-9/+440
| | * Clarify Fixture#key_ and value_listJeremy Kemper2010-06-081-7/+5
| | * Merge remote branch 'docrails/master'Xavier Noria2010-06-084-6/+117
| | |\
| | * | Bring pg back.José Valim2010-06-081-1/+1
| | * | Avoid PostgreSQL and MySQL tests warnings.Emilio Tagua2010-06-082-3/+6
| | * | Revert "Add shallow routes to the new router" for now. Needs more work.David Heinemeier Hansson2010-06-083-75/+3
| | * | Fix ActiveRecord::Base.compute_type swallowing NoMethodError. [#4751 state:re...Andrew Bloomgarden2010-06-083-1/+22
| | * | Memoize the object returned by _view in ActionView::TestCase::BehaviorDavid Chelimsky2010-06-082-6/+12
| * | | Update bundler dependencywycats2010-06-081-1/+1
* | | | Added :locale option explanation for number_to_currencySlobodan Kovacevic2010-06-101-0/+2
| |_|/ |/| |
* | | Merge remote branch 'rails/master'Xavier Noria2010-06-0877-646/+721
|\ \ \ | | |/ | |/|
| * | Add parentheses to avoid warnings when running AR tests.Emilio Tagua2010-06-081-4/+4
| |/
| * Bump Arel to 0.4.0Emilio Tagua2010-06-081-1/+1
| * Temporarily revert "Update after_commit and after_rollback docs and tests to ...Jeremy Kemper2010-06-085-440/+9
| * Get ready for beta 4David Heinemeier Hansson2010-06-0816-16/+16
| * Fixed double output from cache in no caching modeDavid Heinemeier Hansson2010-06-082-29/+14
| * forcing encoding on 1.9 when dealing with "binary" columns [#4612 state:resol...Aaron Patterson2010-06-081-0/+4
| * Missing require restoredwycats2010-06-081-0/+1