aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Bring back AMo#i18n_key methodSantiago Pastorino2011-03-303-8/+13
* Merge branch 'master' of github.com:rails/railsAaron Patterson2011-03-303-19/+25
|\
| * Make action_method? public and change implicit rendering to override it instead.José Valim2011-03-303-19/+25
* | TableAlias leg ordering has changed, so change accordinglyAaron Patterson2011-03-301-1/+1
* | test against AR class rather than the relation (thanks Andrew White!)Aaron Patterson2011-03-291-2/+2
* | Merge branch 'master' into zomgAaron Patterson2011-03-2973-150/+972
|\|
| * order is not guaranteed by this select, so add an order and call first!Aaron Patterson2011-03-291-1/+1
| * oracle stores this with microseconds, so convert to seconds before comparingAaron Patterson2011-03-291-1/+1
| * make sure that active connections are not cleared during test when an excepti...Aaron Patterson2011-03-292-2/+12
| * clearing active connections in the ConnectionManagement middleware if an exce...Aaron Patterson2011-03-292-0/+10
| * proxy body responses so we close database connections after body is flushedAaron Patterson2011-03-293-9/+49
| * Pass the proper method_name instead of hardcoding to action_name.José Valim2011-03-292-9/+11
| * Quote find_in_batches ORDER BY clause [#6620 state:resolved]Andrew White2011-03-295-3/+33
| * Delegate first!, last!, any? and many? to scopedAndrew White2011-03-294-2/+54
| * Dont call authenticate_or_request_with_http_basic twiceDavid Heinemeier Hansson2011-03-291-4/+2
| * Remove 'warning: ambiguous first argument' when running ActionPack testsSebastian Martinez2011-03-292-4/+4
| * Change exists? so that it doesn't instantiate records [#6127 state:resolved]Andrew White2011-03-292-4/+15
| * Move mapper_test to the appropriate locationPrem Sichanugrist2011-03-291-0/+0
| * Update the wildcard route to be non-greedy by default, therefore be able to m...Prem Sichanugrist2011-03-295-3/+59
| * Fix examplesDavid Heinemeier Hansson2011-03-282-2/+2
| * Added Base.http_basic_authenticate_with to do simple http basic authenticatio...David Heinemeier Hansson2011-03-283-14/+69
| * make sure we have an active database connection before running each connectio...Aaron Patterson2011-03-282-5/+10
| * adding active_connections? to the connection pool for finding open connectionsAaron Patterson2011-03-282-0/+39
| * adding active_connection? to the connection poolAaron Patterson2011-03-282-0/+14
| * testing app delegation from the ConnectionManagement middlewareAaron Patterson2011-03-281-3/+20
| * namespacing connection management tests. :heart:Aaron Patterson2011-03-281-18/+22
| * sql logger ignores schema statementsAaron Patterson2011-03-283-2/+32
| * Bring #reorder backSebastian Martinez2011-03-284-3/+13
| * Engines that use isolate_namespace with nested modules should set correct mod...Rolf Timmermans2011-03-282-2/+41
| * Added new #update_column method.Sebastian Martinez2011-03-2714-21/+132
| * let these heredocs flow with the codeXavier Noria2011-03-281-14/+15
| * Make edge and dev options use edge mysql2Santiago Pastorino2011-03-271-6/+14
| * Revert "Removed #update_attribute method. New #update_column method."Sebastian Martinez2011-03-2713-78/+80
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-273-9/+10
| |\
| | * AR validations and callbacks guide: put update_attribute backXavier Noria2011-03-271-0/+2
| | * A little minor rephrasing for improved readability.mhutchin2011-03-271-1/+1
| | * Minor typo fix.mhutchin2011-03-271-1/+1
| | * Updated guides for new #update_column.Sebastian Martinez2011-03-261-2/+2
| | * Proc objects for cache_path for caches_action no longer need controller objec...Ryan Bigg2011-03-261-7/+6
| * | Fix documentation typoPrem Sichanugrist2011-03-281-1/+1
| * | Add controller-specific `force_ssl` method to force web browser to use HTTPS ...Prem Sichanugrist2011-03-286-0/+144
| * | s/with/when/Xavier Noria2011-03-271-1/+1
| * | Add `config.force_ssl` configuration which will load `Rack::SSL` middleware i...Prem Sichanugrist2011-03-279-18/+40
| * | fixes a couple of regexps, the suite showed warnings about themXavier Noria2011-03-271-2/+2
| * | Fix alias_method, add testDavid Heinemeier Hansson2011-03-272-1/+2
| * | cleaning up typecast test a littleAaron Patterson2011-03-261-6/+8
| * | refactoring tz to a variable rather than repeating itAaron Patterson2011-03-261-2/+4
| * | Allow FormHelper#form_for to specify the :method as a direct option instead o...David Heinemeier Hansson2011-03-263-4/+36
| * | adding a test for attributes after type cast. thanks nragaz. :heart:Aaron Patterson2011-03-261-0/+17
| * | Make JavaScriptHelper#j() an alias for JavaScriptHelper#escape_javascript() -...David Heinemeier Hansson2011-03-262-0/+7