aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | Using Object#in? and Object#either? in various placesPrem Sichanugrist2011-04-115-7/+13
| | | | | | | | | | | | | | | | | | | | 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-081-4/+6
| | | | | | | | | | | | | | | | | | | | Improved formatting of csrf_helper and improved test coverage
| | * | | Merge branch 'master' of github.com:rails/railsAaron Patterson2011-04-071-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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-072-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 29592a7f09dda2e7e1e0a915d9230fe6a9b5c0af.
| | | * | | Revert "Eagerly load Signed and Permanent cookies"Santiago Pastorino2011-04-071-17/+10
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit dffeda377021ba8691381195f5a2889f8e040b93.
| | | * | | 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 ↵Santiago Pastorino2011-04-061-0/+12
| | | | | | | | | | | | | | | | | | | | 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-051-2/+2
| | | | |
| | * | | raise if someone tries to modify the flash when it was already streamed back ↵Santiago Pastorino2011-04-051-1/+19
| | | |/ | | |/| | | | | | | | | to the client or converted to HTTP headers
| | * | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-0311-22/+29
| | |\ \
| | | * | 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
| | | |
| | * | Implicit actions named not_implemented can be renderedSantiago Pastorino2011-04-021-0/+2
| | | |
| * | | Unify sprockets config optionsJoshua Peek2011-03-301-1/+1
| | | |
| * | | Merge branch 'master' into sprocketsJoshua Peek2011-03-3014-56/+117
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: railties/lib/rails/application/configuration.rb
| * \ \ \ Merge branch 'master' into sprocketsJoshua Peek2011-03-302-2/+9
| |\ \ \ \
| * | | | | Seperate asset directoriesJoshua Peek2011-03-291-1/+3
| | | | | |
| * | | | | Rename option to config.asset_pipelineJoshua Peek2011-03-291-1/+1
| | | | | |
| * | | | | Change back to /assets prefixJoshua Peek2011-03-291-2/+2
| | | | | |
| * | | | | Only add fingerprints if perform_caching is onJoshua Peek2011-03-291-1/+1
| | | | | |
| * | | | | Copy use_sprockets configJoshua Peek2011-03-292-2/+3
| | | | | |
| * | | | | Use sprockets helpers if config.use_sprockets is setJoshua Peek2011-03-292-6/+22
| | | | | |
| * | | | | Tests for SprocketsHelperJoshua Peek2011-03-291-5/+11
| | | | | |
| * | | | | Update sprockets path generation methodJoshua Peek2011-03-281-1/+1
| | | | | |
| * | | | | Add SprocketsHelperJoshua Peek2011-03-282-0/+79
| | | | | |
| * | | | | Remove sprockets exception from main asset helpersJoshua Peek2011-03-282-20/+0
| | | | | |
| * | | | | Add sprockets md5s to asset tagsJoshua Peek2011-03-222-0/+20
| | | | | |
* | | | | | Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-04-035-30/+68
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-311-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-311-1/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | default response status and error messages should be returned Signed-off-by: José Valim <jose.valim@gmail.com>
| * | | | 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-302-19/+20
| | | | |
* | | | | Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-03-304-24/+32
|\| | | |
| * | | | 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
| | | | |
| * | | | Update the wildcard route to be non-greedy by default, therefore be able to ↵Prem Sichanugrist2011-03-291-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-281-1/+1
| | | | |
| * | | | Added Base.http_basic_authenticate_with to do simple http basic ↵David Heinemeier Hansson2011-03-281-14/+16
| | |_|/ | |/| | | | | | | | | | authentication with a single class method call [DHH]