aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
...
| | * removed :nodoc: from ActionController::MimeRespondsJo Liss2011-04-101-2/+2
| | * Merge branch 'master' of github.com:lifo/docrailsRyan Bigg2011-04-0515-65/+116
| | |\
| | * | 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 sugg...David Heinemeier Hansson2011-04-124-5/+5
| * | | Using Object#in? and Object#either? in various placesPrem Sichanugrist2011-04-115-7/+13
| * | | Make csrf_meta_tags use the tag helperJames Robinson2011-04-081-4/+6
| * | | Merge branch 'master' of github.com:rails/railsAaron Patterson2011-04-071-1/+1
| |\ \ \
| | * | | Cache flash nowSantiago Pastorino2011-04-071-1/+1
| | * | | Revert "Use freeze instead of close!"Santiago Pastorino2011-04-072-5/+14
| | * | | Revert "Eagerly load Signed and Permanent cookies"Santiago Pastorino2011-04-071-17/+10
| | * | | Eagerly load Signed and Permanent cookiesSantiago Pastorino2011-04-071-10/+17
| | * | | Use freeze instead of close!Santiago Pastorino2011-04-062-14/+5
| * | | | getting the flash hash under testAaron Patterson2011-04-061-0/+4
| * | | | favor composition over inheritance, have FlashHash delegate to a HashAaron Patterson2011-04-061-7/+40
| |/ / /
| * | | CookieJar should prefer composition over inheritanceAaron Patterson2011-04-061-6/+10
| * | | Make process reuse the env var passed as argumentSantiago Pastorino2011-04-061-5/+4
| * | | raise if someone tries to modify the cookies when it was already streamed bac...Santiago Pastorino2011-04-061-0/+12
| * | | Add ClosedError message to the initializerSantiago Pastorino2011-04-063-5/+10
| * | | do not return html safe strings from auto_linkAaron Patterson2011-04-051-2/+2
| * | | raise if someone tries to modify the flash when it was already streamed back ...Santiago Pastorino2011-04-051-1/+19
| | |/ | |/|
| * | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-0311-22/+29
| |\ \
| | * | 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
| * | Implicit actions named not_implemented can be renderedSantiago Pastorino2011-04-021-0/+2
| * | Improve docs.José Valim2011-03-311-0/+31
| * | pass respond_with options to controller render when using a template for api ...Josh Kalderimis2011-03-313-5/+5
| * | only try to display an api template in responders if the request is a get or ...Josh Kalderimis2011-03-311-4/+9
| * | when using respond_with with an invalid resource and custom options, the defa...Josh Kalderimis2011-03-311-1/+2
* | | Unify sprockets config optionsJoshua Peek2011-03-301-1/+1
* | | Merge branch 'master' into sprocketsJoshua Peek2011-03-3014-56/+117
|\| |
| * | 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-302-19/+20
| * | 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
| * | Update the wildcard route to be non-greedy by default, therefore be able to m...Prem Sichanugrist2011-03-291-1/+7
| * | Fix examplesDavid Heinemeier Hansson2011-03-281-1/+1
| * | Added Base.http_basic_authenticate_with to do simple http basic authenticatio...David Heinemeier Hansson2011-03-281-14/+16
| |/
| * 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-283-0/+37
| * | fixes a couple of regexps, the suite showed warnings about themXavier Noria2011-03-271-2/+2
| * | Fix alias_method, add testDavid Heinemeier Hansson2011-03-271-1/+1
| * | Allow FormHelper#form_for to specify the :method as a direct option instead o...David Heinemeier Hansson2011-03-261-2/+13
| * | Make JavaScriptHelper#j() an alias for JavaScriptHelper#escape_javascript() -...David Heinemeier Hansson2011-03-261-0/+5
| |/
| * correction to the outputted controller name in the diagnostics error template...Josh Kalderimis2011-03-241-1/+1
* | Merge branch 'master' into sprocketsJoshua Peek2011-03-302-2/+9
|\|
| * Fix filter :only and :except with implicit actionsAndrew White2011-03-231-1/+1