aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* update CHANGELOGSergey Nartimov2012-09-141-0/+16
| | | | | Add entry about 245941101b1ea00a9b1af613c20b0ee994a43946 and 95be790ece75710f2588558a6d5f40fd09543b97.
* 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
|/
* Merge pull request #7616 from lest/null-session-forgery-protectionMichael Koziarski2012-09-132-32/+76
|\ | | | | Implement :null_session CSRF protection method
| * Implement :null_session CSRF protection methodSergey Nartimov2012-09-132-32/+76
| | | | | | | | | | | | | | | | 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).
* | Define a SynchronousQueue for test in Action Pack.Rafael Mendonça França2012-09-122-6/+10
| | | | | | | | We don't need to rely on rails/queueing in Action Pack tests
* | Merge pull request #7612 from arunagw/build_fix_queueCarlos Antonio da Silva2012-09-121-0/+6
|\ \ | | | | | | Fix build Rails.queue
| * | Fix build Rails.queueArun Agrawal2012-09-121-0/+6
| |/ | | | | | | see 34b23e7110a3a13cf157608cefc9b5701017bf39
* / warning removed.Arun Agrawal2012-09-121-1/+0
|/ | | | | 1. Unused variable 2. possibly useless use of a variable in void context
* Merge pull request #7594 from guilleiguaran/rb-template-handlerRafael Mendonça França2012-09-104-0/+14
|\ | | | | Add .rb template handler
| * Add .rb template handlerGuillermo Iguaran2012-09-114-0/+14
| | | | | | | | This handler simply allows arbitrary Ruby code as a template
* | Merge pull request #7513 from kalys/masterCarlos Antonio da Silva2012-09-096-10/+10
|\ \ | | | | | | ERB::Util.html_escape encodes single quote as #39. Decimal form has better support in old browsers.
| * | &#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
|\ \ | | | | | | | | | | | | 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-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 tests
| * | 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
|/ / | | | | | | | | | | | | 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
| |
* | 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
| | | | | | | | Also just set the hash value instead of merging when it's only one key.
* | Merge pull request #7189 from GCorbel/excerpt_with_separationCarlos Antonio da Silva2012-09-083-11/+64
|\ \ | | | | | | Add a separator option for the excerpt function.
| * | Add a separation option for the excerpt functionGuirec Corbel2012-09-083-11/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | 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
| * | 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
|\| | | | | | | | Use Dalli for memcache session store
| * | 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
| | | | | | | | | | | | There is no memcache gem left in repo.
* | | 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
| | | | | | | | | | 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-052-16/+22
| |
* | 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-042-85/+94
|\ \ \ | | | | | | | | Refactor `Mime::Type`
| * | | Refactor `Mime::Type`Aleksey Magusev2012-09-052-85/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `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-032-37/+70
| | | |
* | | | Fix concerns not executing block in mapperErnie Miller2012-09-032-2/+29
| | | | | | | | | | | | | | | | Also, add documentation for alternate usage.
* | | | Allow routing concerns to accept a callableErnie Miller2012-09-033-5/+34
|/ / / | | | | | | | | | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 00:31:05 +0000