aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:rails/railsAaron Patterson2011-04-072-4/+4
|\
| * Cache flash nowSantiago Pastorino2011-04-071-1/+1
| * Revert "Use freeze instead of close!"Santiago Pastorino2011-04-073-11/+14
| * Revert "Eagerly load Signed and Permanent cookies"Santiago Pastorino2011-04-071-17/+10
| * 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
* | 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
* 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 bac...Santiago Pastorino2011-04-062-0/+63
* 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
* 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
| * 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 level...Amaia Castro2011-03-311-0/+3
| * 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
* | only try to display an api template in responders if the request is a get or ...Josh Kalderimis2011-03-313-4/+31
* | when using respond_with with an invalid resource and custom options, the defa...Josh Kalderimis2011-03-312-1/+19
* | use assert_equal so we get normal error messages along with our custom failur...Aaron Patterson2011-03-301-3/+3
* | 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
* | 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
* | 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-294-3/+47
* | 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
|/
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-271-7/+6
|\
| * Proc objects for cache_path for caches_action no longer need controller objec...Ryan Bigg2011-03-261-7/+6
* | Add controller-specific `force_ssl` method to force web browser to use HTTPS ...Prem Sichanugrist2011-03-285-0/+122
* | 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
* | Allow FormHelper#form_for to specify the :method as a direct option instead o...David Heinemeier Hansson2011-03-263-4/+36
* | Make JavaScriptHelper#j() an alias for JavaScriptHelper#escape_javascript() -...David Heinemeier Hansson2011-03-262-0/+7
|/
* correction to the outputted controller name in the diagnostics error template...Josh Kalderimis2011-03-242-1/+17