aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | Fix concerns not executing block in mapperErnie Miller2012-09-032-2/+29
* | | | Allow routing concerns to accept a callableErnie Miller2012-09-033-5/+34
|/ / /
* | | Fix example code: use tasks instead of commentsErik Behrends2012-09-021-1/+1
* | | Merge pull request #7495 from steveklabnik/issue_7478Aaron Patterson2012-09-013-4/+18
|\ \ \ | |_|/ |/| |
| * | Force reloading of the session after destroyAndreas Loupasakis2012-09-011-0/+3
| * | Override rack's destroy_session in cookie storeAndreas Loupasakis2012-09-011-0/+8
| * | Assign a new session_id to session options hashAndreas Loupasakis2012-09-011-2/+2
| * | Properly reset the session on reset_sessionSteve Klabnik2012-08-311-2/+5
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-012-1/+5
|\ \ \
| * | | reverting changes from commit b0896c38Sven Kraeuter | 5v3n2012-09-011-1/+1
| * | | Fix comment about Session.Steve Klabnik2012-08-311-1/+1
| * | | there is no "delete" action in a controllerSven Kräuter2012-08-311-1/+1
| * | | Added example of using options_for_select() with select_tag()Kir Shatrov2012-08-301-0/+4
* | | | Remove unneeded requirePiotr Sarnacki2012-09-011-1/+0
* | | | Sprockets-rails tests failDmitry Vorotilin2012-09-016-18/+10
* | | | Revert "Merge pull request #7452 from arunagw/memcached_dalli"Jon Leighton2012-08-312-7/+7
* | | | Revert "Add missing require"Jon Leighton2012-08-311-1/+0
* | | | Merge pull request #7479 from eriko/masterXavier Noria2012-08-311-1/+1
|\ \ \ \ | |_|/ / |/| | |