aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* s/is is/isVijay Dev2011-12-011-1/+1
* Merge pull request #3816 from lest/exception-page-utf-8Yehuda Katz2011-11-302-12/+35
|\
| * fix exception page when template contains utf-8 and parameters contain utf-8lest2011-11-302-12/+35
* | Merge pull request #3786 from nashby/add-namespace-to-formVijay Dev2011-11-301-1/+1
|\ \
| * | update guidesVasiliy Ermolovich2011-11-281-1/+1
* | | fix bad nodocsVijay Dev2011-12-011-11/+21
| |/ |/|
* | switch WatchStack to use composition, tighten up APIAaron Patterson2011-11-301-6/+13
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-309-14/+21
|\ \
| * | Fixing incorrect documentation Aviv Ben-Yosef2011-11-301-2/+2
| * | Fix ActionDispatch::Request method explanationsTravis Pew2011-11-281-5/+5
| * | there is no need to repeat about possibility of using -h option to get full helpSergey Parizhskiy2011-11-281-1/+1
| * | Merge branch 'master' of github.com:lifo/docrailsSergey Parizhskiy2011-11-28159-1812/+2855
| |\ \
| | * | Update information about foreign key plugins support in the guidesRodrigo Rosenfeld Rosas2011-11-281-1/+1
| | * | Revert "fixed typo in getting started form_for for comments"Arun Agrawal2011-11-281-1/+1
| | * | fixed typo in getting started form_for for commentsTim Reischmann2011-11-281-1/+1
| | * | Update Object#in? description for https://github.com/rails/rails/pull/3767Tadas Tamošauskas2011-11-271-1/+3
| | * | [Docs] Adding RequestId middleware in configuring middlewareArun Agrawal2011-11-271-0/+1
| | * | Documentation about config.log_level config optionsArun Agrawal2011-11-271-0/+2
| | * | Cosmetic fixes in AM validatations docsAlexey Vakhov2011-11-272-4/+4
| | * | Let's say this 3.1.3 instead of 3.1.1 in docsArun Agrawal2011-11-261-1/+1
| * | | completed documentation for the rails server commandSergey Parizhskiy2011-11-281-0/+2
* | | | Revert "Implement ArraySerializer and move old serialization API to a new nam...José Valim2011-11-3016-734/+431
* | | | Revert "avoid hundreds of thousands of calls to (Symbol|String)#to_s"Aaron Patterson2011-11-301-2/+2
* | | | avoid hundreds of thousands of calls to (Symbol|String)#to_sAaron Patterson2011-11-301-2/+2
* | | | `run_test` method conflicts with newer minitest, so change the nameAaron Patterson2011-11-301-5/+5
* | | | Using InstanceMethods in a Concern is deprecatedJeremy Kemper2011-11-301-10/+6
* | | | Merge pull request #3810 from lest/fix-warningsJosé Valim2011-11-307-40/+35
|\ \ \ \
| * | | | fix method redefined warning in activemodellest2011-11-302-1/+5
| * | | | fix deprecation warnings in activeresourcelest2011-11-302-27/+25
| * | | | fix method redefined warnings in testslest2011-11-303-12/+5
|/ / / /
* | | | Merge pull request #3809 from lest/test-helpers-in-erbJosé Valim2011-11-301-0/+2
|\ \ \ \
| * | | | fix warning in tests when using render_erb helperlest2011-11-301-0/+2
* | | | | Merge pull request #3806 from lest/test-helpers-in-erbJosé Valim2011-11-306-17/+31
|\| | | |
| * | | | test helpers in erb using erblest2011-11-306-17/+31
|/ / / /
* | | | Merge pull request #1915 from bogdan/active_record_mapJon Leighton2011-11-306-2/+62
|\ \ \ \
| * | | | ActiveRecord::Relation#pluck methodBogdan Gusiev2011-11-306-2/+62
* | | | | Log 'Filter chain halted as CALLBACKNAME rendered or redirected' every time a...José Valim2011-11-307-8/+50
* | | | | Update sprockets which theoretically fixes the regression we have seen.José Valim2011-11-301-1/+1
* | | | | Fixes for using action view template in isolation.José Valim2011-11-303-2/+12
|/ / / /
* | | | Module#synchronize is deprecated with no replacement. Please use `monitor` f...Aaron Patterson2011-11-293-89/+5
* | | | push synchronization in to each method. Reduces method calls and makesAaron Patterson2011-11-291-25/+29
* | | | Automatic closure of connections in threads is deprecated. For exampleAaron Patterson2011-11-294-27/+31
* | | | AbstractAdapter#close can be called to add the connection back to theAaron Patterson2011-11-293-11/+35
* | | | Start implementing @reserved_connections in terms of connection leases.Aaron Patterson2011-11-291-3/+3
* | | | Rename `checked_out` to more descriptive `active_connections`Aaron Patterson2011-11-291-3/+3
* | | | Use connection lease to determine "checked_out" connectionsAaron Patterson2011-11-291-17/+21
* | | | expire will set in_use to falseAaron Patterson2011-11-292-0/+12
* | | | last_use is set on connection leaseAaron Patterson2011-11-291-0/+6
* | | | Leased connections return false on second leaseAaron Patterson2011-11-292-4/+15
* | | | Adapters keep in_use flag when leasedAaron Patterson2011-11-292-1/+30