aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into sprocketsJoshua Peek2011-04-1243-96/+551
|\
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-123-4/+7
| |\
| | * Added missing </tt>Oge Nnadi2011-04-111-1/+1
| | |
| | * removed :nodoc: from ActionController::MimeRespondsJo Liss2011-04-101-2/+2
| | | | | | | | | | | | | | | So we don't miss out on the nice documentation of the respond_to and respond_with instance methods. Also added :nodoc: to protected method.
| | * Merge branch 'master' of github.com:lifo/docrailsRyan Bigg2011-04-0525-76/+291
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of github.com:lifo/docrails: (57 commits) Made the defaults section a little more readable and more to the point, giving a overview of the possibilities. Added information about default values added .'s to headings in the initialization textile page s/ERb/ERB/g (part II) s/ERb/ERB/g Bump up erubis to 2.7.0 Implicit actions named not_implemented can be rendered Gem::Specification#has_rdoc= is deprecated since rubygems 1.7.0 default_executable is deprecated since rubygems 1.7.0 Trivial fix to HTTP Digest auth MD5 example Moved Turn activation/dependency to railties fix typo Direct logging of Active Record to STDOUT so it's shown inline with the results in the console [DHH] Add using Turn with natural language test case names if the library is available (which it will be in Rails 3.1) [DHH] require turn only for minitest Use Turn to format all Rails tests and enable the natural language case names Improve docs. pass respond_with options to controller render when using a template for api navigation only try to display an api template in responders if the request is a get or there are no errors when using respond_with with an invalid resource and custom options, the default response status and error messages should be returned ...
| | * | Correct documentation on url_for. It doesn't call to_s, but rather to_paramRyan Bigg2011-04-051-1/+4
| | | |
| * | | Change Object#either? to Object#among? -- thanks to @jamesarosen for the ↵David Heinemeier Hansson2011-04-129-10/+10
| | | | | | | | | | | | | | | | suggestion!
| * | | Fix failing test case on masterPrem Sichanugrist2011-04-101-1/+1
| | | | | | | | | | | | | | | | It turned out that I overlook at some replacements ..
| * | | Using Object#in? and Object#either? in various placesPrem Sichanugrist2011-04-1112-16/+29
| | | | | | | | | | | | | | | | There're a lot of places in Rails source code which make a lot of sense to switching to Object#in? or Object#either? instead of using [].include?.
| * | | Make csrf_meta_tags use the tag helperJames Robinson2011-04-082-9/+9
| | | | | | | | | | | | | | | | Improved formatting of csrf_helper and improved test coverage
| * | | Merge branch 'master' of github.com:rails/railsAaron Patterson2011-04-072-4/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of github.com:rails/rails: Cache flash now Revert "Use freeze instead of close!" Revert "Eagerly load Signed and Permanent cookies" cookies here Eagerly load Signed and Permanent cookies Use freeze instead of close!
| | * | | Cache flash nowSantiago Pastorino2011-04-071-1/+1
| | | | |
| | * | | Revert "Use freeze instead of close!"Santiago Pastorino2011-04-073-11/+14
| | | | | | | | | | | | | | | | | | | | This reverts commit 29592a7f09dda2e7e1e0a915d9230fe6a9b5c0af.
| | * | | Revert "Eagerly load Signed and Permanent cookies"Santiago Pastorino2011-04-071-17/+10
| | | | | | | | | | | | | | | | | | | | This reverts commit dffeda377021ba8691381195f5a2889f8e040b93.
| | * | | cookies hereSantiago Pastorino2011-04-071-3/+3
| | | | |
| | * | | Eagerly load Signed and Permanent cookiesSantiago Pastorino2011-04-071-10/+17
| | | | |
| | * | | Use freeze instead of close!Santiago Pastorino2011-04-063-14/+11
| | | | |
| * | | | many args does not make sense with the current implementation because of how ↵Aaron Patterson2011-04-061-10/+0
| | | | | | | | | | | | | | | | | | | | `use` works
| * | | | getting the flash hash under testAaron Patterson2011-04-062-0/+104
| | | | |
| * | | | favor composition over inheritance, have FlashHash delegate to a HashAaron Patterson2011-04-062-11/+44
| |/ / /
| * | | CookieJar should prefer composition over inheritanceAaron Patterson2011-04-061-6/+10
| | | |
| * | | Delete useless argumentsSantiago Pastorino2011-04-061-6/+6
| | | |
| * | | Delete useless env variableSantiago Pastorino2011-04-061-9/+3
| | | |
| * | | Add tests to verify that signed and permanent cookies raises if someone triesSantiago Pastorino2011-04-061-0/+51
| | | | | | | | | | | | | | | | | | | | to modify the cookies when it was already streamed back to the client or converted to HTTP headers
| * | | Make process reuse the env var passed as argumentSantiago Pastorino2011-04-062-5/+12
| | | |
| * | | raise if someone tries to modify the cookies when it was already streamed ↵Santiago Pastorino2011-04-062-0/+63
| | | | | | | | | | | | | | | | back to the client or converted to HTTP headers
| * | | Add ClosedError message to the initializerSantiago Pastorino2011-04-063-5/+10
| | | |
| * | | do not return html safe strings from auto_linkAaron Patterson2011-04-052-7/+13
| | | |
| * | | raise if someone tries to modify the flash when it was already streamed back ↵Santiago Pastorino2011-04-052-1/+69
| | |/ | |/| | | | | | | to the client or converted to HTTP headers
| * | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-0312-24/+31
| |\ \
| | * | s/ERb/ERB/g (part II)Akira Matsuda2011-04-031-2/+2
| | | |
| | * | s/ERb/ERB/gAkira Matsuda2011-04-037-12/+12
| | | | | | | | | | | | | | | | | | | | 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
| | | |
| | * | 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.
| | * Fix grammar, formatting, and cross referencesJohn Firebaugh2011-03-281-8/+8
| | |
| | * Add docs for ActionController::Metal class methodsGabriel Horner2011-03-281-1/+5
| | |
| * | 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-021-2/+0
| | |
| * | 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>
* | | Unify sprockets config optionsJoshua Peek2011-03-301-1/+1
| | |
* | | Merge branch 'master' into sprocketsJoshua Peek2011-03-3024-62/+344
|\| | | | | | | | | | | | | | 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
| * | Make action_method? public and change implicit rendering to override it instead.José Valim2011-03-303-19/+25
| | |
| * | 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
| * | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 11:51:24 +0000