aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Rename .rb template handler to .ruby to avoid conflicts with mustache views c...Guillermo Iguaran2012-09-174-5/+5
* Check if etag exists before to do the gsubRafael Mendonça França2012-09-151-2/+4
* fix the buildSteve Klabnik2012-09-151-0/+1
* Support for multiple etags in an If-None-Match headerTravis Warlick2012-09-153-1/+48
* update CHANGELOGSergey Nartimov2012-09-141-0/+16
* Merge pull request #7634 from arunagw/build_fix_actionmailerJosé Valim2012-09-141-0/+1
|\
| * Build fix for ActionMailerArun Agrawal2012-09-141-0/+1
* | use presence method instead of checking for blankNihad Abbasov2012-09-141-1/+1
|/
* Merge pull request #7616 from lest/null-session-forgery-protectionMichael Koziarski2012-09-132-32/+76
|\
| * Implement :null_session CSRF protection methodSergey Nartimov2012-09-132-32/+76
* | Define a SynchronousQueue for test in Action Pack.Rafael Mendonça França2012-09-122-6/+10
* | Merge pull request #7612 from arunagw/build_fix_queueCarlos Antonio da Silva2012-09-121-0/+6
|\ \
| * | Fix build Rails.queueArun Agrawal2012-09-121-0/+6
| |/
* / warning removed.Arun Agrawal2012-09-121-1/+0
|/
* Merge pull request #7594 from guilleiguaran/rb-template-handlerRafael Mendonça França2012-09-104-0/+14
|\
| * Add .rb template handlerGuillermo Iguaran2012-09-114-0/+14
* | Merge pull request #7513 from kalys/masterCarlos Antonio da Silva2012-09-096-10/+10
|\ \
| * | &#39 dates back to SGML when &#x27 was introduced in HTML 4.0Kalys Osmonov2012-09-096-10/+10
| |/
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-091-1/+1
|\ \
| * | Doc: sweepers only work on Active Record Modelsschneems2012-09-051-1/+1
* | | Use internal instance variable naming scheme for mounted URL helper proxiesSam Pohlenz2012-09-092-1/+12
| |/ |/|
* | Merge pull request #7577 from frodsan/fix_ap_responseRafael Mendonça França2012-09-081-25/+32
|\ \
| * | set default_headers to nil after use it to avoid order dependent testsFrancesco Rodriguez2012-09-081-25/+32
* | | Fixed missing requireIlya Vorontsov2012-09-081-0/+1
|/ /
* | Tidy up excerpt separator logic a bitCarlos Antonio da Silva2012-09-081-17/+11
* | Improve latest AR and AP changelog entriesCarlos Antonio da Silva2012-09-081-1/+6
* | Refactor some date helpers to use merge!Carlos Antonio da Silva2012-09-081-5/+9
* | Merge pull request #7189 from GCorbel/excerpt_with_separationCarlos Antonio da Silva2012-09-083-11/+64
|\ \
| * | Add a separation option for the excerpt functionGuirec Corbel2012-09-083-11/+64
* | | Add integration tests for reset_session in cookie storeAndreas Loupasakis2012-09-081-0/+20
* | | Add test for clear in ActionDispatch::Request::SessionAndreas Loupasakis2012-09-081-0/+9
|/ /
* | Merge pull request #7565 from guilleiguaran/dalli-session-storeCarlos Antonio da Silva2012-09-071-2/+6
|\ \
| * | Improve error message for memcache session store when dalli isn't loaded in appGuillermo Iguaran2012-09-071-2/+6
* | | Bump builder dependencies in Active Model and Action PackCarlos Antonio da Silva2012-09-071-1/+1
* | | Use merge! to merge additional options onto default optionsCarlos Antonio da Silva2012-09-071-4/+3
* | | Merge pull request #7552 from guilleiguaran/dalli-session-storeSantiago Pastorino2012-09-072-12/+7
|\| |
| * | Dalli doesn't support autoloading of unloaded classesGuillermo Iguaran2012-09-061-5/+0
| * | More fixes for action pack tests with Dalli.Arun Agrawal2012-09-061-3/+3
| * | Let's run action pack tests with DalliArun Agrawal2012-09-061-4/+4
* | | AS::Callbacks: deprecate monkey patch of object callbacksBogdan Gusiev2012-09-072-8/+8
* | | fix tests on Ruby 2.0.0Aaron Patterson2012-09-061-1/+1
|/ /
* | Define just the cattr_reader.Rafael Mendonça França2012-09-051-1/+2
* | Use the same logger that ActionView::Base for the DigestorRafael Mendonça França2012-09-052-16/+22
* | Remove unneeded requiresRafael Mendonça França2012-09-051-7/+3
* | Merge pull request #7530 from robin850/masterXavier Noria2012-09-051-1/+1
|\ \
| * | Fix a typoRobin Dupret2012-09-051-1/+1
* | | Merge pull request #7522 from lexmag/mime_typeRafael Mendonça França2012-09-042-85/+94
|\ \ \
| * | | Refactor `Mime::Type`Aleksey Magusev2012-09-052-85/+94
* | | | We dont need to include the name and the format in the digest -- source is au...David Heinemeier Hansson2012-09-041-1/+1
* | | | Make enhanced routing Concerns more tell-don't-askErnie Miller2012-09-032-37/+70