aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-0329-99/+119
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | added .'s to headings in the initialization textile pageorta2011-04-031-3/+2
| | | | | | | | | | |
| * | | | | | | | | | s/ERb/ERB/g (part II)Akira Matsuda2011-04-036-8/+8
| | | | | | | | | | |
| * | | | | | | | | | s/ERb/ERB/gAkira Matsuda2011-04-0310-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The author of ERB sais, his eRuby implementation was originally named "ERb/ERbLight" and then renamed to "ERB" when started bundled as a Ruby standard lib. http://www2a.biglobe.ne.jp/~seki/ruby/erb.html
| * | | | | | | | | | Trivial fix to HTTP Digest auth MD5 exampleJon Cooper2011-03-311-1/+1
| | | | | | | | | | |
| * | | | | | | | | | fix typoburningTyger2011-04-011-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Explain in the method doc that you need to call respond_to at the class ↵Amaia Castro2011-03-311-0/+3
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | level in order to use respond_with.
| * | | | | | | | | Grammar tweaks to the guides guidelinesJosiah Ivey2011-03-311-9/+10
| | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Symbol to proc is preferred over longer form of mapRyan Bigg2011-03-311-1/+1
| | | | | | | | |
| * | | | | | | | Cleanup of named_scope documentationRyan Bigg2011-03-311-8/+9
| | | | | | | | |
| * | | | | | | | Fix typo in named_scope documentationRyan Bigg2011-03-311-1/+1
| | | | | | | | |
| * | | | | | | | add space to conform with styleEadz2011-03-311-1/+1
| | | | | | | | |
| * | | | | | | | Documented undocumented feature: Class methods on your model are ↵Eadz2011-03-311-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automatically available on scopes
| * | | | | | | | Minor rephrasing to improve grammar and readability.mhutchin2011-03-291-1/+1
| | | | | | | | |
| * | | | | | | | Fixed typo and improved readability.mhutchin2011-03-291-1/+2
| | | | | | | | |
| * | | | | | | | Fix formatting and broken markupJohn Firebaugh2011-03-281-11/+10
| | | | | | | | |
| * | | | | | | | Fix grammar, formatting, and cross referencesJohn Firebaugh2011-03-281-8/+8
| | | | | | | | |
| * | | | | | | | Add docs for ActionController::Metal class methodsGabriel Horner2011-03-281-1/+5
| | | | | | | | |
| * | | | | | | | Merge branch 'master' of github.com:lifo/docrailsozzyaaron2011-03-292-36/+8
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix Basic Authentication examplesSebastian Martinez2011-03-282-3/+3
| | | | | | | | | |
| | * | | | | | | | Updated Basic Authentication guides to reflect new ↵Sebastian Martinez2011-03-282-36/+8
| | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | Base.http_basic_authenticate_with method
| * / | | | | | | Added back the Callback debugging section by interrogating the _*_callbacks ↵ozzyaaron2011-03-291-0/+18
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | method
| * | | | | | | Minor typo correction.mhutchin2011-03-271-1/+1
| | | | | | | |
* | | | | | | | Bump up erubis to 2.7.0Santiago Pastorino2011-04-021-1/+1
| | | | | | | |
* | | | | | | | Implicit actions named not_implemented can be renderedSantiago Pastorino2011-04-023-2/+15
| | | | | | | |
* | | | | | | | Gem::Specification#has_rdoc= is deprecated since rubygems 1.7.0Santiago Pastorino2011-04-027-11/+0
| | | | | | | |
* | | | | | | | default_executable is deprecated since rubygems 1.7.0Santiago Pastorino2011-04-011-1/+0
| | | | | | | |
* | | | | | | | Moved Turn activation/dependency to railtiesDavid Heinemeier Hansson2011-03-318-38/+12
| | | | | | | |
* | | | | | | | Direct logging of Active Record to STDOUT so it's shown inline with the ↵David Heinemeier Hansson2011-03-312-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | results in the console [DHH]
* | | | | | | | Add using Turn with natural language test case names if the library is ↵David Heinemeier Hansson2011-03-314-17/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | available (which it will be in Rails 3.1) [DHH]
* | | | | | | | require turn only for minitestDavid Heinemeier Hansson2011-03-311-2/+6
| | | | | | | |
* | | | | | | | Use Turn to format all Rails tests and enable the natural language case namesDavid Heinemeier Hansson2011-03-312-0/+6
| | | | | | | |
* | | | | | | | Improve docs.José Valim2011-03-311-0/+31
| | | | | | | |
* | | | | | | | pass respond_with options to controller render when using a template for api ↵Josh Kalderimis2011-03-315-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | navigation Signed-off-by: José Valim <jose.valim@gmail.com>
* | | | | | | | only try to display an api template in responders if the request is a get or ↵Josh Kalderimis2011-03-313-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there are no errors Signed-off-by: José Valim <jose.valim@gmail.com>
* | | | | | | | when using respond_with with an invalid resource and custom options, the ↵Josh Kalderimis2011-03-312-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default response status and error messages should be returned Signed-off-by: José Valim <jose.valim@gmail.com>
* | | | | | | | Delegate pending to skip if Minitest is availableDavid Heinemeier Hansson2011-03-301-21/+25
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | 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