aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Include rack-mini-profiler by default"Rafael França2017-07-242-7/+0
* Merge pull request #29911 from schneems/schneems/rack-mini-profilerSean Griffin2017-07-242-0/+7
|\
| * Include rack-mini-profiler by defaultschneems2017-07-242-0/+7
|/
* Fix test failures when prepared statements are disabledSean Griffin2017-07-243-14/+35
* Fix build failures on PGSean Griffin2017-07-241-0/+4
* Merge pull request #29905 from kamipo/remove_duplicated_assertionSean Griffin2017-07-241-16/+2
|\
| * Remove duplicated assertion in `test_count_with_join`Ryuta Kamizono2017-07-241-16/+2
* | Fix build failures on MySQLSean Griffin2017-07-242-2/+2
* | Refactor Active Record to let Arel manage bind paramsSean Griffin2017-07-2437-459/+283
* | Merge pull request #29894 from eugeneius/check_schema_file_dup_stringKasper Timm Hansen2017-07-242-1/+8
|\ \
| * | Avoid modifying frozen string in check_schema_fileEugene Kenny2017-07-232-1/+8
* | | Merge pull request #29907 from deivid-rodriguez/fix_flaky_message_verifier_testKasper Timm Hansen2017-07-241-1/+1
|\ \ \
| * | | Fix test failure in message verifier testsDavid Rodríguez2017-07-241-1/+1
* | | | Merge pull request #29906 from assain/add_more_tests_to_message_verifierKasper Timm Hansen2017-07-241-0/+15
|\ \ \ \ | |/ / / |/| | |
| * | | add metadata tests: verify methodAssain2017-07-241-0/+15
|/ / /
* | | [ci skip] Remove superfluous paragraphs; fully qualify constants.Kasper Timm Hansen2017-07-241-8/+2
* | | Merge pull request #29892 from assain/documenation_for_metadataKasper Timm Hansen2017-07-243-0/+100
|\ \ \
| * | | add to changelog: purpose and expiry supportAssain2017-07-241-0/+28
| * | | document metadata support added to message encryptor and message verifierAssain2017-07-242-0/+72
| |/ /
* | | Merge pull request #29860 from georgeclaghorn/travel-back-automaticallyRafael França2017-07-243-8/+8
|\ \ \ | |_|/ |/| |
| * | Remove time stubs after each testGeorge Claghorn2017-07-223-8/+8
* | | Merge pull request #29820 from kirs/frozen-actioncableSean Griffin2017-07-2381-1/+159
|\ \ \
| * | | Use frozen string literal in actioncable/Kir Shatrov2017-07-2381-1/+159
* | | | Merge pull request #29900 from kirs/actionview-frozen-friendlySean Griffin2017-07-231-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Make actionview ready for frozen stringsKir Shatrov2017-07-231-1/+2
* | | | Merge pull request #29901 from kirs/actioncable-frozen-friendlySean Griffin2017-07-231-1/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Make actioncable ready for frozen stringsKir Shatrov2017-07-231-1/+5
* | | | Merge pull request #29896 from kirs/frozen-actionmailerRichard Schneeman2017-07-2343-0/+84
|\ \ \ \ | |/ / / |/| | |
| * | | Use frozen string literal in actionmailer/Kir Shatrov2017-07-2343-0/+84
|/ / /
* | | Merge branch 'verify-release'Kasper Timm Hansen2017-07-234-96/+138
|\ \ \
| * | | Update release instructions in light of new tasks.Kasper Timm Hansen2017-07-221-44/+46
| * | | Support multiple versions in release announcement.Kasper Timm Hansen2017-07-222-51/+67
| * | | Add task to verify a release.Kasper Timm Hansen2017-07-222-1/+25
* | | | Merge pull request #29867 from koic/fix_a_failed_ar_test_when_using_oracleKasper Timm Hansen2017-07-231-2/+10
|\ \ \ \
| * | | | Fix a failued AR test when using OracleAdapterKoichi ITO2017-07-201-2/+10
* | | | | Let Metadata instance handle purpose coercion.Kasper Timm Hansen2017-07-231-4/+4
* | | | | Remove dependency on `from_now` extension.Kasper Timm Hansen2017-07-231-1/+1
| |_|_|/ |/| | |
* | | | Merge pull request #29768 from janpieper/sort-enabled-extensions-in-dumpEileen M. Uchitelle2017-07-222-1/+15
|\ \ \ \ | |_|/ / |/| | |
| * | | Sort enabled adapter extensions in schema dumpJan Pieper2017-07-122-1/+15
* | | | Merge pull request #29870 from kamipo/use_true_false_literalsSean Griffin2017-07-222-14/+4
|\ \ \ \
| * | | | Use `TRUE` and `FALSE` boolean literals for MySQLRyuta Kamizono2017-07-202-14/+6
| | |/ / | |/| |
* | | | Merge pull request #29858 from y-yagi/use_argument_error_instead_of_own_error...Rafael França2017-07-212-19/+18
|\ \ \ \
| * | | | Use `ArgumentError` instead of own error classyuuji.yaginuma2017-07-202-19/+18
| |/ / /
* | | | Merge pull request #29869 from kamipo/make_type_map_to_privateRafael França2017-07-219-31/+28
|\ \ \ \
| * | | | Make `type_map` to private because it is only used in the connection adapterRyuta Kamizono2017-07-209-31/+28
| |/ / /
* | | | Merge pull request #29884 from padi/update_rails_5_upgrade_guideRafael França2017-07-212-2/+12
|\ \ \ \
| * | | | Suppress documentation for content_tag_for and div_for since they were remove...Marc Rendl Ignacio2017-07-211-2/+2
| * | | | Updates Rails upgrade guide for 4.2 to 5.0 regarding the removal of `ActionVi...Marc Rendl Ignacio2017-07-211-0/+10
| | |/ / | |/| |
* | | | Merge pull request #29885 from freeletics/fix-false-positive-testRafael França2017-07-211-11/+11
|\ \ \ \
| * | | | Fix false positive test related to wrong app root path.Wojciech Wnętrzak2017-07-211-11/+11