aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
* Allow strings in the controller test describe blocksMike Moore2012-09-241-0/+1
| | | | | Allow controller tests using the spec DSL to match strings. Add test coverage for the register_spec_type calls.
* Support controller tests using spec DSL - fixes #7743Mike Moore2012-09-241-3/+5
| | | | Add tests for controller tests using the minitest spec DSL.
* documents ActionDispatch::Http::UploadedFileXavier Noria2012-09-221-6/+55
|
* Merge pull request #7713 from ↵Xavier Noria2012-09-221-6/+2
|\ | | | | | | | | porras/action-dispatch-upload-delegates-close-to-tempfile Delegate ActionDispatch::Http::UploadedFile#close to tempfile
| * Accept parameters in methods delegated to tempfileSergio Gil Pérez de la Manga2012-09-221-6/+2
| |
| * Delegate ActionDispatch::Http::UploadedFile#close to tempfileSergio Gil Pérez de la Manga2012-09-201-1/+1
| |
* | fix typos and improve AC::StrongParameters documentation [ci skip]Francesco Rodriguez2012-09-201-6/+8
|/
* update AC::StrongParameters documentationFrancesco Rodriguez2012-09-191-8/+53
|
* define permitted? method instead of use an alias to fix rdocFrancesco Rodriguez2012-09-191-2/+12
|
* update AC::Parameters documentation [ci skip]Francesco Rodriguez2012-09-191-1/+149
|
* update AC::ParameterMissing documentation [ci skip]Francesco Rodriguez2012-09-191-2/+9
|
* update AC::ParamsWrapper documentation [ci skip]Francesco Rodriguez2012-09-191-3/+4
|
* Set AC::Parameters.permit_all_parameters explicitly to false when ↵Guillermo Iguaran2012-09-191-1/+1
| | | | config.action_controller.permit_all_parameters is not present
* Removing to_shorthand from default_controller_and_action. Fixes #6497Luiz Felipe2012-09-191-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 warningSergey Nartimov2012-09-191-3/+3
|
* Merge pull request #7251 from rails/integrate-strong_parametersDavid Heinemeier Hansson2012-09-185-7/+134
|\ | | | | Integrate strong_parameters in Rails 4
| * AC::ParameterMissing inherits from KeyError since it's more appropiated than ↵Guillermo Iguaran2012-09-161-1/+1
| | | | | | | | IndexError
| * Support fields_for attributes, which may have numeric symbols as hash keysGuillermo Iguaran2012-09-161-0/+4
| |
| * Add config.action_controller.permit_all_attributes to bypass ↵Guillermo Iguaran2012-09-163-1/+7
| | | | | | | | StrongParameters protection
| * Remove integration between attr_accessible/protected and ↵Guillermo Iguaran2012-09-161-7/+2
| | | | | | | | AC::Metal::ParamsWrapper
| * Integrate ActionController::Parameters from StrongParameters gemGuillermo Iguaran2012-09-163-0/+122
| |
* | copy edits 137e5d9Xavier Noria2012-09-181-1/+1
| |
* | Add extra documentation for password_fieldArek W2012-09-181-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 Senn2012-09-172-2/+7
| |
* | removes unnecessary selfXavier Noria2012-09-171-1/+1
| |
* | revises the RDoc of AC::Base.without_modulesXavier Noria2012-09-171-2/+2
| |
* | documents the request and response methods in AC::BaseXavier Noria2012-09-171-3/+21
| |
* | revises RDoc in AC::Metal [ci skip]Xavier Noria2012-09-171-14/+7
| |
* | removes unnecessary selfXavier Noria2012-09-171-1/+1
| |
* | Merge pull request #7669 from guilleiguaran/rename-rb-handlerCarlos Antonio da Silva2012-09-171-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 Iguaran2012-09-171-1/+1
| |/ | | | | | | classes
* / allowing pass couple extension to register_template_handler callTima Maslyuchenko2012-09-171-3/+6
|/
* Check if etag exists before to do the gsubRafael Mendonça França2012-09-151-2/+4
| | | | This fix the build http://travis-ci.org/#!/rails/rails/builds/2459981
* 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
| | |