aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 #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
| |/ / / /
* | | | | Merge pull request #21651 from shingo-nakanishi/fixed_docsYves Senn2015-09-171-1/+1
|\ \ \ \ \
| * | | | | 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 in any lo...Ronak Jangir2015-09-124-2/+39
* | | | | Merge pull request #21637 from amitsuroliya/doc_fixesKasper Timm Hansen2015-09-171-2/+2
|\ \ \ \ \
| * | | | | 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 2Ronak Jangir2015-09-168-58/+85
| | |/ / / / | |/| | | |
* | | | | | s/Github/GitHub/Akira Matsuda2015-09-171-1/+1
* | | | | | Merge pull request #21646 from schneems/schneems/no-hardcoded-ignored-lines-i...Richard Schneeman2015-09-161-1/+1
|\ \ \ \ \ \
| * | | | | | Don't hardcode table nameschneems2015-09-161-1/+1
* | | | | | | Clarify CSRF <script> purpose and protection. Note how to deal with your own ...Jeremy Daer2015-09-162-6/+11
* | | | | | | 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...Avner Cohen2015-09-161-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #21618 from designgrill/masterEileen M. Uchitelle2015-09-162-5/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Improved explanation of the <script> tag CSRF behaviorAnshul Agrawal2015-09-142-5/+3
* | | | | | | Merge pull request #21640 from yahonda/doc_remove_default_nullArthur Nogueira Neves2015-09-151-2/+2
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] Remove `DEFAULT NULL` from examplesYasuo Honda2015-09-161-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #21634 from JuanitoFatas/feature/fewer-rack-env-direct-man...Kasper Timm Hansen2015-09-151-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Use rack.session_options instead of directly change envJuanito Fatas2015-09-161-1/+1
* | | | | | | | Merge pull request #21623 from schneems/schneems/schema-migration-docsRichard Schneeman2015-09-151-1/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Doc SchemaMigration class.schneems2015-09-141-1/+5
| | |_|_|/ / / | |/| | | | |