aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Unify sprockets config optionsJoshua Peek2011-03-304-18/+25
|
* Merge branch 'master' into sprocketsJoshua Peek2011-03-3081-196/+1117
|\ | | | | | | | | Conflicts: railties/lib/rails/application/configuration.rb
| * use assert_equal so we get normal error messages along with our custom ↵Aaron Patterson2011-03-301-3/+3
| | | | | | | | failure message
| * Bring back AMo#i18n_key methodSantiago Pastorino2011-03-303-8/+13
| |
| * Merge branch 'master' of github.com:rails/railsAaron Patterson2011-03-303-19/+25
| |\ | | | | | | | | | | | | * 'master' of github.com:rails/rails: Make action_method? public and change implicit rendering to override it instead.
| | * 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
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (51 commits) order is not guaranteed by this select, so add an order and call first! oracle stores this with microseconds, so convert to seconds before comparing make sure that active connections are not cleared during test when an exception happens clearing active connections in the ConnectionManagement middleware if an exception happens proxy body responses so we close database connections after body is flushed Pass the proper method_name instead of hardcoding to action_name. Quote find_in_batches ORDER BY clause [#6620 state:resolved] Delegate first!, last!, any? and many? to scoped Dont call authenticate_or_request_with_http_basic twice Remove 'warning: ambiguous first argument' when running ActionPack tests Change exists? so that it doesn't instantiate records [#6127 state:resolved] Move mapper_test to the appropriate location Update the wildcard route to be non-greedy by default, therefore be able to match the (.:format) segment [#6605 state:resolved] Fix examples Added Base.http_basic_authenticate_with to do simple http basic authentication with a single class method call [DHH] make sure we have an active database connection before running each connection management test adding active_connections? to the connection pool for finding open connections adding active_connection? to the connection pool testing app delegation from the ConnectionManagement middleware namespacing connection management tests. :heart: ...
| | * 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 ↵Aaron Patterson2011-03-292-2/+12
| | | | | | | | | | | | exception happens
| | * clearing active connections in the ConnectionManagement middleware if an ↵Aaron Patterson2011-03-292-0/+10
| | | | | | | | | | | | exception happens
| | * 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
| | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/implicit_render.rb
| | * 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
| | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| | * 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
| | | | | | | | | | | | | | | | | | It seems like in 89c5b9aee7d7db95cec9e5a934c3761872ab107e Aaron actually put the test in action_dispatch folder. However, there's already a `test/dispatch` directory which I think it's more appropriate. Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
| | * Update the wildcard route to be non-greedy by default, therefore be able to ↵Prem Sichanugrist2011-03-295-3/+59
| | | | | | | | | | | | | | | | | | | | | | | | match the (.:format) segment [#6605 state:resolved] After some discussion with Andrew White, it seems like this is a better approach for handling a wildcard route. However, user can still bring back the old behavior by supplying `:format => false` to the route. Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
| | * Fix examplesDavid Heinemeier Hansson2011-03-282-2/+2
| | |
| | * Added Base.http_basic_authenticate_with to do simple http basic ↵David Heinemeier Hansson2011-03-283-14/+69
| | | | | | | | | | | | authentication with a single class method call [DHH]
| | * make sure we have an active database connection before running each ↵Aaron Patterson2011-03-282-5/+10
| | | | | | | | | | | | connection management test
| | * 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
| | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| | * Engines that use isolate_namespace with nested modules should set correct ↵Rolf Timmermans2011-03-282-2/+41
| | | | | | | | | | | | module prefix for their routes.
| | * Added new #update_column method.Sebastian Martinez2011-03-2714-21/+132
| | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| | * 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
| | | | | | | | | | | | | | | | | | This reverts commit 45c233ef819dc7b67e259dd73f24721fec28b8c8. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| | * 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 ↵Ryan Bigg2011-03-261-7/+6
| | | | | | | | | | | | | | | | object, nor to use send when calling routing helpers
| | * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | protocol This would become useful for site which sometime transferring sensitive information such as account information on particular controller or action. This featured was requested by DHH.
| | * | s/with/when/Xavier Noria2011-03-271-1/+1
| | | |
| | * | Add `config.force_ssl` configuration which will load `Rack::SSL` middleware ↵Prem Sichanugrist2011-03-279-18/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if set to true This will allow user to be able to force all requests to be under HTTPS protocol. This commit was a request from DHH. Special thanks to Josh Peek as well for making `Rack::SSL`.
| | * | fixes a couple of regexps, the suite showed warnings about themXavier Noria2011-03-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A couple of things worth mentioning here: - "{" is a metacharacter, should be escaped if it is meant to match a "{". The code worked, though, because the regexp engine is tolerant to this, but issued warnings. - gsub accepts a string as first argument. That's the best idiom to use when your pattern has no metacharacters, since gsub interprets the string as an exact substring to look for, rather than a regexp. The benefit is that your pattern is crystal clear and needs no backslashes.
| | * | 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
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 00:52:25 +0000