Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7634 from arunagw/build_fix_actionmailer | José Valim | 2012-09-14 | 1 | -0/+1 |
|\ | | | | | Build fix for ActionMailer | ||||
| * | Build fix for ActionMailer | Arun Agrawal | 2012-09-14 | 1 | -0/+1 |
| | | | | | | | | | | | | See http://travis-ci.org/#!/rails/rails/jobs/2444632 | ||||
* | | use presence method instead of checking for blank | Nihad Abbasov | 2012-09-14 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #7616 from lest/null-session-forgery-protection | Michael Koziarski | 2012-09-13 | 2 | -32/+76 |
|\ | | | | | Implement :null_session CSRF protection method | ||||
| * | Implement :null_session CSRF protection method | Sergey Nartimov | 2012-09-13 | 2 | -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ça | 2012-09-12 | 2 | -6/+10 |
| | | | | | | | | We don't need to rely on rails/queueing in Action Pack tests | ||||
* | | Merge pull request #7612 from arunagw/build_fix_queue | Carlos Antonio da Silva | 2012-09-12 | 1 | -0/+6 |
|\ \ | | | | | | | Fix build Rails.queue | ||||
| * | | Fix build Rails.queue | Arun Agrawal | 2012-09-12 | 1 | -0/+6 |
| |/ | | | | | | | see 34b23e7110a3a13cf157608cefc9b5701017bf39 | ||||
* / | warning removed. | Arun Agrawal | 2012-09-12 | 1 | -1/+0 |
|/ | | | | | 1. Unused variable 2. possibly useless use of a variable in void context | ||||
* | Merge pull request #7594 from guilleiguaran/rb-template-handler | Rafael Mendonça França | 2012-09-10 | 4 | -0/+14 |
|\ | | | | | Add .rb template handler | ||||
| * | Add .rb template handler | Guillermo Iguaran | 2012-09-11 | 4 | -0/+14 |
| | | | | | | | | This handler simply allows arbitrary Ruby code as a template | ||||
* | | Merge pull request #7513 from kalys/master | Carlos Antonio da Silva | 2012-09-09 | 6 | -10/+10 |
|\ \ | | | | | | | ERB::Util.html_escape encodes single quote as #39. Decimal form has better support in old browsers. | ||||
| * | | ' dates back to SGML when ' was introduced in HTML 4.0 | Kalys Osmonov | 2012-09-09 | 6 | -10/+10 |
| |/ | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-09-09 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | ||||
| * | | Doc: sweepers only work on Active Record Models | schneems | 2012-09-05 | 1 | -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 proxies | Sam Pohlenz | 2012-09-09 | 2 | -1/+12 |
| |/ |/| | |||||
* | | Merge pull request #7577 from frodsan/fix_ap_response | Rafael Mendonça França | 2012-09-08 | 1 | -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 tests | Francesco Rodriguez | 2012-09-08 | 1 | -25/+32 |
| | | | |||||
* | | | Fixed missing require | Ilya Vorontsov | 2012-09-08 | 1 | -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 bit | Carlos Antonio da Silva | 2012-09-08 | 1 | -17/+11 |
| | | |||||
* | | Improve latest AR and AP changelog entries | Carlos Antonio da Silva | 2012-09-08 | 1 | -1/+6 |
| | | |||||
* | | Refactor some date helpers to use merge! | Carlos Antonio da Silva | 2012-09-08 | 1 | -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_separation | Carlos Antonio da Silva | 2012-09-08 | 3 | -11/+64 |
|\ \ | | | | | | | Add a separator option for the excerpt function. | ||||
| * | | Add a separation option for the excerpt function | Guirec Corbel | 2012-09-08 | 3 | -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 store | Andreas Loupasakis | 2012-09-08 | 1 | -0/+20 |
| | | | |||||
* | | | Add test for clear in ActionDispatch::Request::Session | Andreas Loupasakis | 2012-09-08 | 1 | -0/+9 |
|/ / | |||||
* | | Merge pull request #7565 from guilleiguaran/dalli-session-store | Carlos Antonio da Silva | 2012-09-07 | 1 | -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 app | Guillermo Iguaran | 2012-09-07 | 1 | -2/+6 |
| | | | |||||
* | | | Bump builder dependencies in Active Model and Action Pack | Carlos Antonio da Silva | 2012-09-07 | 1 | -1/+1 |
| | | | |||||
* | | | Use merge! to merge additional options onto default options | Carlos Antonio da Silva | 2012-09-07 | 1 | -4/+3 |
| | | | |||||
* | | | Merge pull request #7552 from guilleiguaran/dalli-session-store | Santiago Pastorino | 2012-09-07 | 2 | -12/+7 |
|\| | | | | | | | | Use Dalli for memcache session store | ||||
| * | | Dalli doesn't support autoloading of unloaded classes | Guillermo Iguaran | 2012-09-06 | 1 | -5/+0 |
| | | | |||||
| * | | More fixes for action pack tests with Dalli. | Arun Agrawal | 2012-09-06 | 1 | -3/+3 |
| | | | |||||
| * | | Let's run action pack tests with Dalli | Arun Agrawal | 2012-09-06 | 1 | -4/+4 |
| | | | | | | | | | | | | There is no memcache gem left in repo. | ||||
* | | | AS::Callbacks: deprecate monkey patch of object callbacks | Bogdan Gusiev | 2012-09-07 | 2 | -8/+8 |
| | | | |||||
* | | | fix tests on Ruby 2.0.0 | Aaron Patterson | 2012-09-06 | 1 | -1/+1 |
|/ / | |||||
* | | Define just the cattr_reader. | Rafael Mendonça França | 2012-09-05 | 1 | -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 Digestor | Rafael Mendonça França | 2012-09-05 | 2 | -16/+22 |
| | | |||||
* | | Remove unneeded requires | Rafael Mendonça França | 2012-09-05 | 1 | -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/master | Xavier Noria | 2012-09-05 | 1 | -1/+1 |
|\ \ | | | | | | | Fix a typo in AD | ||||
| * | | Fix a typo | Robin Dupret | 2012-09-05 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #7522 from lexmag/mime_type | Rafael Mendonça França | 2012-09-04 | 2 | -85/+94 |
|\ \ \ | | | | | | | | | Refactor `Mime::Type` | ||||
| * | | | Refactor `Mime::Type` | Aleksey Magusev | 2012-09-05 | 2 | -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 Hansson | 2012-09-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | authoritative enough | ||||
* | | | | Make enhanced routing Concerns more tell-don't-ask | Ernie Miller | 2012-09-03 | 2 | -37/+70 |
| | | | | |||||
* | | | | Fix concerns not executing block in mapper | Ernie Miller | 2012-09-03 | 2 | -2/+29 |
| | | | | | | | | | | | | | | | | Also, add documentation for alternate usage. | ||||
* | | | | Allow routing concerns to accept a callable | Ernie Miller | 2012-09-03 | 3 | -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 comments | Erik Behrends | 2012-09-02 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #7495 from steveklabnik/issue_7478 | Aaron Patterson | 2012-09-01 | 3 | -4/+18 |
|\ \ \ | |_|/ |/| | | Properly reset the session on reset_session | ||||
| * | | Force reloading of the session after destroy | Andreas Loupasakis | 2012-09-01 | 1 | -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. |