aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | fix the buildSteve Klabnik2012-09-151-0/+1
| |
* | Support for multiple etags in an If-None-Match headerTravis Warlick2012-09-151-1/+7
| | | | | | | | | | | | | | | | This is a rebased version of #2520. Conflicts: actionpack/test/dispatch/request_test.rb
* | Merge pull request #7634 from arunagw/build_fix_actionmailerJosé Valim2012-09-141-0/+1
|\ \ | | | | | | Build fix for ActionMailer
| * | Build fix for ActionMailerArun Agrawal2012-09-141-0/+1
| | | | | | | | | | | | | | | | | | See http://travis-ci.org/#!/rails/rails/jobs/2444632
* | | use presence method instead of checking for blankNihad Abbasov2012-09-141-1/+1
|/ /
* | Implement :null_session CSRF protection methodSergey Nartimov2012-09-131-22/+70
| | | | | | | | | | | | | | | | It's further work on CSRF after 245941101b1ea00a9b1af613c20b0ee994a43946. The :null_session CSRF protection method provide an empty session during request processing but doesn't reset it completely (as :reset_session does).
* | Merge pull request #7594 from guilleiguaran/rb-template-handlerRafael Mendonça França2012-09-101-0/+1
|\ \ | | | | | | Add .rb template handler
| * | Add .rb template handlerGuillermo Iguaran2012-09-111-0/+1
| | | | | | | | | | | | This handler simply allows arbitrary Ruby code as a template
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
| * | | Doc: sweepers only work on Active Record Modelsschneems2012-09-051-1/+1
| | | | | | | | | | | | In response to this rails issue: https://github.com/rails/rails/issues/3729
* | | | Use internal instance variable naming scheme for mounted URL helper proxiesSam Pohlenz2012-09-091-1/+1
| |/ / |/| |
* | | Fixed missing requireIlya Vorontsov2012-09-081-0/+1
| | | | | | | | | | | | | | | | | | | | | Missing require caused fail of guide generation (in action_dispatch/http/mime_type, line 295, undefined method `ends_with` for "to_ary":String) With this fix guides were normally generated
* | | Tidy up excerpt separator logic a bitCarlos Antonio da Silva2012-09-081-17/+11
| | |
* | | Refactor some date helpers to use merge!Carlos Antonio da Silva2012-09-081-5/+9
| | | | | | | | | | | | Also just set the hash value instead of merging when it's only one key.
* | | Add a separation option for the excerpt functionGuirec Corbel2012-09-081-11/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The separation option enable to keep entire words, lines or anything. To split by line, like github, we can set the separation option as \n. To split by word, like google, we can set the separation option as " ". The radius option represent the number of lines or words we want to have in the result. The default behaviour is the same. If we don't set the separation option, it split the text any where.
* | | 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
| * | | Improve error message for memcache session store when dalli isn't loaded in appGuillermo Iguaran2012-09-071-2/+6
| | | |
* | | | 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-071-3/+3
|\| | | | | | | | | | | Use Dalli for memcache session store
| * | | More fixes for action pack tests with Dalli.Arun Agrawal2012-09-061-3/+3
| | | |
* | | | AS::Callbacks: deprecate monkey patch of object callbacksBogdan Gusiev2012-09-071-1/+1
| | | |
* | | | 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
| | | | | | | | | | | | | | | This will trim down the API and avoid some error that can be made changing the cache object.
* | | Use the same logger that ActionView::Base for the DigestorRafael Mendonça França2012-09-051-2/+5
| | |
* | | Remove unneeded requiresRafael Mendonça França2012-09-051-7/+3
| | | | | | | | | | | | | | | We should not require all the core extensions inside the frameworks. The logger is already defined in the Action View framework.
* | | Merge pull request #7530 from robin850/masterXavier Noria2012-09-051-1/+1
|\ \ \ | | | | | | | | Fix a typo in AD
| * | | Fix a typoRobin Dupret2012-09-051-1/+1
| | | |
* | | | Merge pull request #7522 from lexmag/mime_typeRafael Mendonça França2012-09-041-84/+93
|\ \ \ \ | | | | | | | | | | Refactor `Mime::Type`
| * | | | Refactor `Mime::Type`Aleksey Magusev2012-09-051-84/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `parse` method performance improvements - ~27-33%: accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-shockwave-flash, application/vnd.ms-excel, application/vnd.ms-powerpoint, application/msword, , pronto/1.00.00, sslvpn/1.00.00.00, */*" Benchmark.measure{ 1_000_0.times { Mime::Type.parse(accept) }} old: 1.430000 0.000000 1.430000 ( 1.440977) new: 0.920000 0.000000 0.920000 ( 0.921813)
* | | | | We dont need to include the name and the format in the digest -- source is ↵David Heinemeier Hansson2012-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | authoritative enough
* | | | | Make enhanced routing Concerns more tell-don't-askErnie Miller2012-09-031-25/+55
| | | | |
* | | | | Fix concerns not executing block in mapperErnie Miller2012-09-031-2/+19
| | | | | | | | | | | | | | | | | | | | Also, add documentation for alternate usage.
* | | | | Allow routing concerns to accept a callableErnie Miller2012-09-031-3/+7
|/ / / / | | | | | | | | | | | | | | | | | | | | This allows us to make alterations to the generated routes based on the scope of the current mapper, and otherwise allows us to move larger blocks of concerns out of the routes file, altogether.
* | | | 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
|\ \ \ \ | |_|/ / |/| | | Properly reset the session on reset_session
| * | | Force reloading of the session after destroyAndreas Loupasakis2012-09-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use load_for_write! to ensure a refresh of the session object. This way the new session_id and the empty data will be stored properly. E.g. in the case of the session cookie store this means that a new digest will be returned to the user.
| * | | 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
| | | | | | | | | | | | | | | | Fixes #7478
* | | | 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
| | | | | | | | | | | | | | | | | | | | SessionHash isn't a thing, and tenses are wrong.
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Method invalid_asset_host! was delegated to controller but sprockets compile assets in their own scope without controller. And if we set asset_host with second parameter it should raise error through invalid_asset_host!. But since controller is nil it cannot be reached.
* | | | | Revert "Merge pull request #7452 from arunagw/memcached_dalli"Jon Leighton2012-08-311-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7256cb53e0c34e510a4d59a50d120c0358cf1d99, reversing changes made to 6ebe22c3ae716d089af1e5090ddb0d12b31af8ac. Reason: A test was failing.
* | | | | Merge pull request #7479 from eriko/masterXavier Noria2012-08-311-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | the example for contraint( :ip => XXXX) has an invalid regex
| * | | | Update actionpack/lib/action_dispatch/routing/mapper.rbErik Ordway2012-08-291-1/+1
| | | | | | | | | | | | | | | escape the '.'s  
* | | | | Instrumentation requires RackDelegationJosé Valim2012-08-301-0/+1
| | | | | | | | | | | | | | | Since it uses request and response methods
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 01:49:37 +0000