aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | Merge pull request #21614 from kamipo/correctly_dump_composite_primary_keyJeremy Daer (Kemper)2015-09-1910-37/+114
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Correctly dump composite primary keyRyuta Kamizono2015-09-2010-37/+114
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #21682 from vlado/obsolete_require_removedKasper Timm Hansen2015-09-201-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | String#strip_heredocs doesn't need Object#tryVlado Cingel2015-09-191-2/+0
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | s/seperator/separator/gAkira Matsuda2015-09-201-3/+3
* | | | | | | | | | | | | Merge pull request #21680 from kamipo/remove_connection_in_statement_poolAkira Matsuda2015-09-206-10/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove `@connection` in `StatementPool`Ryuta Kamizono2015-09-206-10/+8
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #21679 from jdantonio/replace-thread-safeKasper Timm Hansen2015-09-1918-43/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Replaced `ThreadSafe::Map` with successor `Concurrent::Map`.Jerry D'Antonio2015-09-1918-43/+45
* | | | | | | | | | | | | | Merge pull request #21669 from amitsuroliya/improve_docsYves Senn2015-09-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Correcting `NameError` error message in `mattr_reader` method. Since this com...amitkumarsuroliya2015-09-191-2/+2
* | | | | | | | | | | | | | | Merge pull request #21676 from amitsuroliya/correct_resultYves Senn2015-09-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Corrected numeric conversions output [ci skip]amitkumarsuroliya2015-09-191-2/+2
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | 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