aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #21674 from amitsuroliya/comment_fixCarlos Antonio da Silva2015-09-193-4/+4
|\
| * Replace `#=>` with `# =>` [ci skip]amitkumarsuroliya2015-09-193-4/+4
* | Merge pull request #21675 from y-yagi/fix_test_method_nameKasper Timm Hansen2015-09-191-1/+1
|\ \ | |/ |/|
| * change test method name to the appropriate nameyuuji.yaginuma2015-09-191-1/+1
|/
* Merge pull request #21673 from ronakjangir47/kindle_guideXavier Noria2015-09-192-6/+6
|\
| * Fixed unclosed tags in kindle guide source [ci skip]Ronak Jangir2015-09-192-6/+6
|/
* Merge pull request #21650 from mcfiredrill/nodoc-raw-write-attributeArthur Nogueira Neves2015-09-191-1/+1
|\
| * nodoc raw_write_attributeTony Miller2015-09-191-1/+1
* | mostly remove the ParamsParser middlewareAaron Patterson2015-09-188-16/+4
* | Merge branch 'pp'Aaron Patterson2015-09-185-56/+67
|\ \
| * | remove outdated commentAaron Patterson2015-09-181-4/+0
| * | all parameter parsing is done through the request object now.Aaron Patterson2015-09-181-1/+1
| * | let the request object handle parsing XML postsAaron Patterson2015-09-181-2/+9
| * | remove setting request parameters for JSON requestsAaron Patterson2015-09-181-2/+0
| * | remove the request parameter from `parse_formatted_parameters`Aaron Patterson2015-09-182-6/+6
| * | do not instantiate a param parser middlewareAaron Patterson2015-09-182-14/+14
| * | push the parameter parsers on to the classAaron Patterson2015-09-183-37/+37
| * | stop eagerly parsing parametersAaron Patterson2015-09-181-2/+0
| * | only wrap the strategy with exception handlingAaron Patterson2015-09-181-9/+10
| * | pull `normalize_encode_params` upAaron Patterson2015-09-182-4/+3
| * | remove the `default` parameter from the parser methodAaron Patterson2015-09-181-8/+5
| * | move parameter parsing to the request objectAaron Patterson2015-09-182-22/+37
* | | Merge pull request #21632 from kirs/feature/translation-helper-include-interp...Kasper Timm Hansen2015-09-182-1/+14
|\ \ \
| * | | Include interpolation values to translation_missing helperKir Shatrov2015-09-182-1/+14
* | | | Merge pull request #21667 from ronakjangir47/test_action_mailer_without_any_f...Kasper Timm Hansen2015-09-182-0/+13
|\ \ \ \
| * | | | Added test for `any` if called without specifying any format Ronak Jangir2015-09-182-0/+13
* | | | | let the guides home point to the new release series endpoints [ci skip]Xavier Noria2015-09-181-5/+5
| |_|/ / |/| | |
* | | | Merge pull request #21666 from ronakjangir47/enum_refactoringGodfrey Chan2015-09-181-21/+13
|\ \ \ \
| * | | | 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.Since https:...amitkumarsuroliya2015-09-181-3/+3
* | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-09-184-8/+8
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | s/JQuery/jQuery/Akira Matsuda2015-09-181-1/+1
| * | | | [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 skip]amitkumarsuroliya2015-09-181-1/+1
|/ / / /
* | | | Merge pull request #21658 from defektive/patch-1Rafael Mendonça França2015-09-171-1/+1
|\ \ \ \
| * | | | Change AbstractRequest to ActionDispatch::RequestBradley D2015-09-171-1/+1
|/ / / /
* | | | 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 MI...Isaac Betesh2015-09-091-0/+7
* | | | | Merge pull request #21625 from amitsuroliya/improve_docsAndrew White2015-09-171-2/+2
|\ \ \ \ \
| * | | | | Improve Docs of ActiveSupport::TimeZone [ci skip]amitkumarsuroliya2015-09-151-2/+2
* | | | | | 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.Wojciech Wnętrzak2015-09-173-2/+11
* | | | | | | Merge pull request #21654 from yui-knk/fix/doc_apiArthur Nogueira Neves2015-09-171-7/+1
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] Remove useless "@api public/private"yui-knk2015-09-171-7/+1
| |/ / / / / /