Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | documents ActionDispatch::Http::UploadedFile | Xavier Noria | 2012-09-22 | 1 | -6/+55 |
| | |||||
* | Merge pull request #7713 from ↵ | Xavier Noria | 2012-09-22 | 1 | -6/+2 |
|\ | | | | | | | | | porras/action-dispatch-upload-delegates-close-to-tempfile Delegate ActionDispatch::Http::UploadedFile#close to tempfile | ||||
| * | Accept parameters in methods delegated to tempfile | Sergio Gil Pérez de la Manga | 2012-09-22 | 1 | -6/+2 |
| | | |||||
| * | Delegate ActionDispatch::Http::UploadedFile#close to tempfile | Sergio Gil Pérez de la Manga | 2012-09-20 | 1 | -1/+1 |
| | | |||||
* | | fix typos and improve AC::StrongParameters documentation [ci skip] | Francesco Rodriguez | 2012-09-20 | 1 | -6/+8 |
|/ | |||||
* | update AC::StrongParameters documentation | Francesco Rodriguez | 2012-09-19 | 1 | -8/+53 |
| | |||||
* | define permitted? method instead of use an alias to fix rdoc | Francesco Rodriguez | 2012-09-19 | 1 | -2/+12 |
| | |||||
* | update AC::Parameters documentation [ci skip] | Francesco Rodriguez | 2012-09-19 | 1 | -1/+149 |
| | |||||
* | update AC::ParameterMissing documentation [ci skip] | Francesco Rodriguez | 2012-09-19 | 1 | -2/+9 |
| | |||||
* | update AC::ParamsWrapper documentation [ci skip] | Francesco Rodriguez | 2012-09-19 | 1 | -3/+4 |
| | |||||
* | Set AC::Parameters.permit_all_parameters explicitly to false when ↵ | Guillermo Iguaran | 2012-09-19 | 1 | -1/+1 |
| | | | | config.action_controller.permit_all_parameters is not present | ||||
* | Removing to_shorthand from default_controller_and_action. Fixes #6497 | Luiz Felipe | 2012-09-19 | 1 | -1/+1 |
| | | | | | When using shortcut routes inside an engine the "to_shorthand" variable is set to true, causing the module scope of the route to not be applied. | ||||
* | fix shadowing outer local variable warning | Sergey Nartimov | 2012-09-19 | 1 | -3/+3 |
| | |||||
* | Merge pull request #7251 from rails/integrate-strong_parameters | David Heinemeier Hansson | 2012-09-18 | 5 | -7/+134 |
|\ | | | | | Integrate strong_parameters in Rails 4 | ||||
| * | AC::ParameterMissing inherits from KeyError since it's more appropiated than ↵ | Guillermo Iguaran | 2012-09-16 | 1 | -1/+1 |
| | | | | | | | | IndexError | ||||
| * | Support fields_for attributes, which may have numeric symbols as hash keys | Guillermo Iguaran | 2012-09-16 | 1 | -0/+4 |
| | | |||||
| * | Add config.action_controller.permit_all_attributes to bypass ↵ | Guillermo Iguaran | 2012-09-16 | 3 | -1/+7 |
| | | | | | | | | StrongParameters protection | ||||
| * | Remove integration between attr_accessible/protected and ↵ | Guillermo Iguaran | 2012-09-16 | 1 | -7/+2 |
| | | | | | | | | AC::Metal::ParamsWrapper | ||||
| * | Integrate ActionController::Parameters from StrongParameters gem | Guillermo Iguaran | 2012-09-16 | 3 | -0/+122 |
| | | |||||
* | | copy edits 137e5d9 | Xavier Noria | 2012-09-18 | 1 | -1/+1 |
| | | |||||
* | | Add extra documentation for password_field | Arek W | 2012-09-18 | 1 | -1/+1 |
| | | | | | | | | I think this should be explicit as the password fields behaviour is inconsistent with other fields in this regard. It had me scratching my head until I dug through the source code. | ||||
* | | log 404 status when ActiveRecord::RecordNotFound was raised (#7646) | Yves Senn | 2012-09-17 | 2 | -2/+7 |
| | | |||||
* | | removes unnecessary self | Xavier Noria | 2012-09-17 | 1 | -1/+1 |
| | | |||||
* | | revises the RDoc of AC::Base.without_modules | Xavier Noria | 2012-09-17 | 1 | -2/+2 |
| | | |||||
* | | documents the request and response methods in AC::Base | Xavier Noria | 2012-09-17 | 1 | -3/+21 |
| | | |||||
* | | revises RDoc in AC::Metal [ci skip] | Xavier Noria | 2012-09-17 | 1 | -14/+7 |
| | | |||||
* | | removes unnecessary self | Xavier Noria | 2012-09-17 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #7669 from guilleiguaran/rename-rb-handler | Carlos Antonio da Silva | 2012-09-17 | 1 | -1/+1 |
|\ \ | | | | | | | 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 | 1 | -1/+1 |
| |/ | | | | | | | classes | ||||
* / | allowing pass couple extension to register_template_handler call | Tima Maslyuchenko | 2012-09-17 | 1 | -3/+6 |
|/ | |||||
* | Check if etag exists before to do the gsub | Rafael Mendonça França | 2012-09-15 | 1 | -2/+4 |
| | | | | This fix the build http://travis-ci.org/#!/rails/rails/builds/2459981 | ||||
* | fix the build | Steve Klabnik | 2012-09-15 | 1 | -0/+1 |
| | |||||
* | Support for multiple etags in an If-None-Match header | Travis Warlick | 2012-09-15 | 1 | -1/+7 |
| | | | | | | | | This is a rebased version of #2520. Conflicts: actionpack/test/dispatch/request_test.rb | ||||
* | 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 |
|/ | |||||
* | Implement :null_session CSRF protection method | Sergey Nartimov | 2012-09-13 | 1 | -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-handler | Rafael Mendonça França | 2012-09-10 | 1 | -0/+1 |
|\ | | | | | Add .rb template handler | ||||
| * | Add .rb template handler | Guillermo Iguaran | 2012-09-11 | 1 | -0/+1 |
| | | | | | | | | This handler simply allows arbitrary Ruby code as a template | ||||
* | | 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 | 1 | -1/+1 |
| |/ |/| | |||||
* | | 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 |
| | | |||||
* | | 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. | ||||
* | | Add a separation option for the excerpt function | Guirec Corbel | 2012-09-08 | 1 | -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-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 |
| | | | |||||
* | | | 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 | 1 | -3/+3 |
|\| | | | | | | | | Use Dalli for memcache session store |