Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7251 from rails/integrate-strong_parameters | David Heinemeier Hansson | 2012-09-18 | 7 | -41/+251 |
|\ | | | | | Integrate strong_parameters in Rails 4 | ||||
| * | Support fields_for attributes, which may have numeric symbols as hash keys | Guillermo Iguaran | 2012-09-16 | 1 | -0/+18 |
| | | |||||
| * | Add config.action_controller.permit_all_attributes to bypass ↵ | Guillermo Iguaran | 2012-09-16 | 1 | -0/+14 |
| | | | | | | | | StrongParameters protection | ||||
| * | Change tainted/untainted wording to permitted/forbidden | Guillermo Iguaran | 2012-09-16 | 3 | -26/+26 |
| | | |||||
| * | Don't use assert_nothing_raised when assert_equal is used | Guillermo Iguaran | 2012-09-16 | 1 | -4/+2 |
| | | |||||
| * | require abstract_unit in parameters tests | Guillermo Iguaran | 2012-09-16 | 3 | -0/+3 |
| | | |||||
| * | Remove integration between attr_accessible/protected and ↵ | Guillermo Iguaran | 2012-09-16 | 2 | -41/+0 |
| | | | | | | | | AC::Metal::ParamsWrapper | ||||
| * | Integrate ActionController::Parameters from StrongParameters gem | Guillermo Iguaran | 2012-09-16 | 5 | -0/+218 |
| | | |||||
* | | log 404 status when ActiveRecord::RecordNotFound was raised (#7646) | Yves Senn | 2012-09-17 | 1 | -0/+15 |
| | | |||||
* | | Merge pull request #7669 from guilleiguaran/rename-rb-handler | Carlos Antonio da Silva | 2012-09-17 | 2 | -3/+3 |
|\ \ | | | | | | | Rename .rb template handler to .ruby to avoid conflicts with mustache classes | ||||
| * | | Rename .rb template handler to .ruby to avoid conflicts with mustache views ↵ | Guillermo Iguaran | 2012-09-17 | 2 | -3/+3 |
| |/ | | | | | | | classes | ||||
* / | allowing pass couple extension to register_template_handler call | Tima Maslyuchenko | 2012-09-17 | 1 | -0/+9 |
|/ | |||||
* | Support for multiple etags in an If-None-Match header | Travis Warlick | 2012-09-15 | 1 | -0/+39 |
| | | | | | | | | This is a rebased version of #2520. Conflicts: actionpack/test/dispatch/request_test.rb | ||||
* | Merge pull request #7616 from lest/null-session-forgery-protection | Michael Koziarski | 2012-09-13 | 1 | -10/+6 |
|\ | | | | | Implement :null_session CSRF protection method | ||||
| * | Implement :null_session CSRF protection method | Sergey Nartimov | 2012-09-13 | 1 | -10/+6 |
| | | | | | | | | | | | | | | | | 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 | 2 | -0/+11 |
|\ | | | | | Add .rb template handler | ||||
| * | Add .rb template handler | Guillermo Iguaran | 2012-09-11 | 2 | -0/+11 |
| | | | | | | | | 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 |
| |/ | |||||
* / | Use internal instance variable naming scheme for mounted URL helper proxies | Sam Pohlenz | 2012-09-09 | 1 | -0/+11 |
|/ | |||||
* | set default_headers to nil after use it to avoid order dependent tests | Francesco Rodriguez | 2012-09-08 | 1 | -25/+32 |
| | |||||
* | Merge pull request #7189 from GCorbel/excerpt_with_separation | Carlos Antonio da Silva | 2012-09-08 | 1 | -0/+13 |
|\ | | | | | Add a separator option for the excerpt function. | ||||
| * | Add a separation option for the excerpt function | Guirec Corbel | 2012-09-08 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | 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 #7552 from guilleiguaran/dalli-session-store | Santiago Pastorino | 2012-09-07 | 1 | -9/+4 |
|\ | | | | | Use Dalli for memcache session store | ||||
| * | Dalli doesn't support autoloading of unloaded classes | Guillermo Iguaran | 2012-09-06 | 1 | -5/+0 |
| | | |||||
| * | 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 | 1 | -7/+7 |
|/ | |||||
* | Use the same logger that ActionView::Base for the Digestor | Rafael Mendonça França | 2012-09-05 | 1 | -14/+17 |
| | |||||
* | Merge pull request #7522 from lexmag/mime_type | Rafael Mendonça França | 2012-09-04 | 1 | -1/+1 |
|\ | | | | | Refactor `Mime::Type` | ||||
| * | Refactor `Mime::Type` | Aleksey Magusev | 2012-09-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | `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) | ||||
* | | Make enhanced routing Concerns more tell-don't-ask | Ernie Miller | 2012-09-03 | 1 | -12/+15 |
| | | |||||
* | | Fix concerns not executing block in mapper | Ernie Miller | 2012-09-03 | 1 | -0/+10 |
| | | | | | | | | Also, add documentation for alternate usage. | ||||
* | | Allow routing concerns to accept a callable | Ernie Miller | 2012-09-03 | 2 | -2/+27 |
|/ | | | | | | 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. | ||||
* | Revert "Merge pull request #7452 from arunagw/memcached_dalli" | Jon Leighton | 2012-08-31 | 1 | -4/+4 |
| | | | | | | | This reverts commit 7256cb53e0c34e510a4d59a50d120c0358cf1d99, reversing changes made to 6ebe22c3ae716d089af1e5090ddb0d12b31af8ac. Reason: A test was failing. | ||||
* | Revert "Add missing require" | Jon Leighton | 2012-08-31 | 1 | -1/+0 |
| | | | | | | This reverts commit e4b33b08d6d2b88b627b1e52c4f349e57c5b89fc. https://github.com/rails/rails/pull/7452#issuecomment-8094302 | ||||
* | Fix build about TemplateDigestorTest. | kennyj | 2012-08-30 | 1 | -3/+3 |
| | |||||
* | `Digestor` can now parse old style hash syntax for `render` | Christos Zisopoulos | 2012-08-30 | 2 | -0/+7 |
| | |||||
* | `Digestor` ignores most whitespace when parsing `render` invocations | Christos Zisopoulos | 2012-08-30 | 3 | -0/+27 |
| | |||||
* | Added controller-level etag additions that will be part of the action etag ↵ | David Heinemeier Hansson | 2012-08-29 | 1 | -0/+32 |
| | | | | computation *Jeremy Kemper/DHH* | ||||
* | Add automatic template digests to all CacheHelper#cache calls (originally ↵ | David Heinemeier Hansson | 2012-08-29 | 10 | -5/+158 |
| | | | | spiked in the cache_digests plugin) *DHH* | ||||
* | Add Missing Keys from Journey on failed URL format | schneems | 2012-08-28 | 3 | -12/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | Many named routes have keys that are required to successfully resolve. If a key is left off like this: <%= link_to 'user', user_path %> This will produce an error like this: No route matches {:action=>"show", :controller=>"users"} Since we know that the :id is missing, we can add extra debugging information to the error message. No route matches {:action=>"show", :controller=>"users"} missing required keys: [:id] This will help new and seasoned developers look closer at their parameters. I've also subclassed the routing error to be clear that this error is a result of attempting to generate a url and not because the user is trying to visit a bad url. While this may sound trivial this error message is misleading and confuses most developers. The important part isn't what's in the options its's what's missing. Adding this information to the error message will make debugging much more obvious. This is the sister pull request of https://github.com/rails/journey/pull/44 which will be required to get they missing keys into the correct error message. Example Development Error in Rails: http://cl.ly/image/3S0T0n1T3421 | ||||
* | Add missing require | Rafael Mendonça França | 2012-08-28 | 1 | -0/+1 |
| | |||||
* | Merge pull request #7452 from arunagw/memcached_dalli | Rafael Mendonça França | 2012-08-28 | 1 | -4/+4 |
|\ | | | | | Memcached to dalli for actionpack test. | ||||
| * | Let's run action pack tests with Dalli | Arun Agrawal | 2012-08-27 | 1 | -4/+4 |
| | | | | | | There is no memcache gem left in repo. |