aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* let the request object handle parsing XML postsAaron Patterson2015-09-181-2/+9
| | | | | The test request object will handle parsing XML posts now, so we don't need to eagerly parse them in the test harness
* remove setting request parameters for JSON requestsAaron Patterson2015-09-181-2/+0
| | | | | The request object will automatically parse these in the `parse_formatted_parameters` method, so we don't have to worry about it.
* remove the request parameter from `parse_formatted_parameters`Aaron Patterson2015-09-182-6/+6
| | | | | This is an instance method on the request object now so we don't need it anymore
* do not instantiate a param parser middlewareAaron Patterson2015-09-182-14/+14
| | | | | | we don't actually need a param parser middleware instance since the request object will take care of parsing parameters for us. For now, we'll just configure the parameter parsers on the request in this class.
* push the parameter parsers on to the classAaron Patterson2015-09-183-37/+37
| | | | | | | | The middleware stack is a singleton in the application (one instance is shared for the entire application) which means that there was only one opportunity to set the parameter parsers. Since there is only one set of parameter parsers in an app, lets just configure them on the request class (since that is where they are used).
* stop eagerly parsing parametersAaron Patterson2015-09-181-2/+0
| | | | | Parameters will not be parsed until they are specifically requested via the `request_parameters` method.
* only wrap the strategy with exception handlingAaron Patterson2015-09-181-9/+10
| | | | | | we need to be more specific about exception handling when dealing with the parse strategies. The calls to `return yield` can also raise an exception, but we don't want to handle that in *this* code.
* pull `normalize_encode_params` upAaron Patterson2015-09-182-4/+3
| | | | | `normalize_encode_params` is common to all parser code paths, so we can pull that up and always apply it before assigning the request parameters
* remove the `default` parameter from the parser methodAaron Patterson2015-09-181-8/+5
| | | | | since there is only one "default" strategy now, we can just use the block parameter for that.
* move parameter parsing to the request objectAaron Patterson2015-09-182-22/+37
| | | | | All parameter parsing should be on the request object because the request object is the object that we ask for parameters.
* Merge pull request #21666 from ronakjangir47/enum_refactoringGodfrey Chan2015-09-181-21/+13
|\ | | | | DRY enum conflict detection
| * DRY enum conflict detectionRonak Jangir2015-09-181-21/+13
| |
* | Merge pull request #21662 from amitsuroliya/improve_docsKasper Timm Hansen2015-09-181-3/+3
|\ \ | | | | | | Corrected `to_time` output in ActiveSupport Date Conversion docs [ci …
| * | Corrected `to_time` output in ActiveSupport Date Conversion docs.Since ↵amitkumarsuroliya2015-09-181-3/+3
| | | | | | | | | | | | | | | https://github.com/rails/rails/commit/48583f8bf74d1cefefea3cd6591bd546a9eaff6c, to_time returns times formatted as YYYY-MM-DD HH:MM:SS UTC [ci skip] `to_time` method now returns in `YYYY-MM-DD HH:MM:SS UTC` format.
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-09-184-8/+8
|\ \ \ | | |/ | |/|
| * | s/JQuery/jQuery/Akira Matsuda2015-09-181-1/+1
| | | | | | | | | | | | [ci skip]
| * | [ci skip] Fix module name of documentyui-knk2015-09-171-1/+1
| | |
| * | [ci skip] Replace double spaces with single spaceyui-knk2015-09-171-1/+1
| | |
| * | Add missing and remove unnecessary periods in testing.md [ci skip]Juanito Fatas2015-09-051-5/+5
| | |
* | | File encoding is defaulted to utf-8 in Ruby >= 2.1Akira Matsuda2015-09-1819-29/+0
| | |
* | | D HH => D H HAkira Matsuda2015-09-181-1/+1
| | |
* | | Merge pull request #21660 from amitsuroliya/improve_docsArthur Nogueira Neves2015-09-171-1/+1
|\ \ \ | | |/ | |/| Correct ArgumentError message in ActiveSupport conversions docs [ci s…
| * | Correct ArgumentError message in ActiveSupport conversions docs [ci skip]amitkumarsuroliya2015-09-181-1/+1
|/ / | | | | This was happened after this commit https://github.com/rails/rails/commit/2ebf47aea21ff8ac10681e53e78dd7a0e5c31c6e
* | Merge pull request #21658 from defektive/patch-1Rafael Mendonça França2015-09-171-1/+1
|\ \ | | | | | | Change AbstractRequest to ActionDispatch::Request
| * | Change AbstractRequest to ActionDispatch::RequestBradley D2015-09-171-1/+1
|/ / | | | | | | | | | | AbstractRequest has been deprecated, updating to refer to ActionDispatch::Request instead. [ci skip]
* | Merge pull request #21562 from betesh/mime_types_in_actionmailerAndrew White2015-09-171-0/+7
|\ \ | | | | | | When used by ActionMailer, ActionView should automatically use the correct MIME type just as it does when used by ActionDispatch
| * | When used by ActionMailer, ActionView should automatically use the correct ↵Isaac Betesh2015-09-091-0/+7
| | | | | | | | | | | | MIME type just as it does when used by ActionDispatch #11157
* | | Merge pull request #21625 from amitsuroliya/improve_docsAndrew White2015-09-171-2/+2
|\ \ \ | | | | | | | | Improve Docs of ActiveSupport::TimeZone [ci skip]
| * | | Improve Docs of ActiveSupport::TimeZone [ci skip]amitkumarsuroliya2015-09-151-2/+2
| | | | | | | | | | | | | | | | | | | | `TimeZone` class is a part of `ActiveSupport` module. For Accessing `TimeZone` class, we need to call `ActiveSupport::TimeZone` instead of `TimeZone`. individual `TimeZone` gives `NameError: uninitialized constant ‘TimeZone’ error
* | | | Merge pull request #20889 from morgoth/fix-mailer-previews-on-not-local-requestsAndrew White2015-09-173-2/+11
|\ \ \ \ | | | | | | | | | | Fix displaying mailer previews on non local requests.
| * | | | Fix displaying mailer previews on non local requests.Wojciech Wnętrzak2015-09-173-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | When config `action_mailer.show_previews` is set, previews are displayed regardless of local request check.
* | | | | Merge pull request #21654 from yui-knk/fix/doc_apiArthur Nogueira Neves2015-09-171-7/+1
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] Remove useless "@api public/private"
| * | | | | [ci skip] Remove useless "@api public/private"yui-knk2015-09-171-7/+1
| |/ / / / | | | | | | | | | | | | | | | Other public APIs do not have these annotations.
* | | | | Merge pull request #21651 from shingo-nakanishi/fixed_docsYves Senn2015-09-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fixed helpers submit button Examples [ci skip]
| * | | | | No need the `a`shingo.nakanishi2015-09-171-2/+2
| | | | | |
| * | | | | Fixed helpers submit button Examples [ci skip]shingo.nakanishi2015-09-171-1/+1
| |/ / / /
* | | | | Merge pull request #21581 from ronakjangir47/restrict_with_errorYves Senn2015-09-175-2/+44
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | `restrict_with_error` message will now respect owner’s human name
| * | | | `restrict_with_error` message will now respect owner’s human name in any ↵Ronak Jangir2015-09-124-2/+39
| | | | | | | | | | | | | | | | | | | | locale [kuboon & Ronak Jangir]
* | | | | Merge pull request #21637 from amitsuroliya/doc_fixesKasper Timm Hansen2015-09-171-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Improved ActiveRecord Connection Pool docs [ci skip]
| * | | | | Improved ActiveRecord Connection Pool docs [ci skip]amitkumarsuroliya2015-09-171-2/+2
| | | | | |
* | | | | | Merge pull request #21566 from ronakjangir47/active_record2Kasper Timm Hansen2015-09-168-58/+85
|\ \ \ \ \ \ | | | | | | | | | | | | | | Removed mocha from Active Record Part 2
| * | | | | | Removed mocha from Active Record Part 2Ronak Jangir2015-09-168-58/+85
| | |/ / / / | |/| | | |
* | | | | | s/Github/GitHub/Akira Matsuda2015-09-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #21646 from ↵Richard Schneeman2015-09-161-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | schneems/schneems/no-hardcoded-ignored-lines-in-schema-dumper Don't hardcode table name
| * | | | | | Don't hardcode table nameschneems2015-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The schema_migrations table name is configurable. We should use this value when checking for ignored table names when dumping schema instead of a hardcoded value.
* | | | | | | Clarify CSRF <script> purpose and protection. Note how to deal with your own ↵Jeremy Daer2015-09-162-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <script> tags. Ref #21618 [ci skip]
* | | | | | | Merge pull request #21644 from AvnerCohen/i18n_backendClaudio B.2015-09-161-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update documentation to remove 'desirable' suggestion for what is not a clear cut approach
| * | | | | | | Update documentation to remove 'desirable' suggestion for what is not a ↵Avner Cohen2015-09-161-1/+1
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | clear cut approach
* | | | | | | Merge pull request #21618 from designgrill/masterEileen M. Uchitelle2015-09-162-5/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Improved explanation of the <script> tag CSRF behavior
| * | | | | | Improved explanation of the <script> tag CSRF behaviorAnshul Agrawal2015-09-142-5/+3
| | | | | | |