aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Passing `klass` to `StatementCache.new`Ryuta Kamizono2017-08-046-32/+31
* Merge pull request #30011 from guilherme/fix-migration-generator-special-casesSean Griffin2017-08-032-1/+23
|\
| * Handling add/remove to/from migration edge casesGuilherme Reis Campos2017-08-032-1/+23
* | Merge pull request #30039 from ricardotk002/fix-string-camelize-invalid-optionSean Griffin2017-08-033-0/+26
|\ \
| * | Fix changelog formatSean Griffin2017-08-031-1/+0
| * | Update String#camelize to provide feedback when wrong option is passedRicardo Díaz2017-08-023-0/+27
* | | Merge pull request #29984 from colorfulfool/form-helpers-unicode-sanitizationRafael França2017-08-022-1/+15
|\ \ \
| * | | Allow non-English values for collection_radio_buttons/check_boxescolorfulfool2017-08-022-1/+15
* | | | Merge pull request #29958 from znz/file-nullMatthew Draper2017-08-025-5/+5
|\ \ \ \
| * | | | Use File::NULL instead of "/dev/null"Kazuhiro NISHIYAMA2017-07-315-5/+5
| | |_|/ | |/| |
* | | | Merge pull request #29914 from kamipo/relation_merger_should_not_fill_empty_v...Matthew Draper2017-08-023-19/+30
|\ \ \ \
| * | | | `get_value` and `set_value` in `Relation` are no longer used externallyRyuta Kamizono2017-07-251-9/+10
| * | | | `Relation::Merger` should not fill `values` with empty valuesRyuta Kamizono2017-07-252-10/+20
* | | | | Merge pull request #29842 from kamipo/fix_find_by_with_rangeMatthew Draper2017-08-023-4/+12
|\ \ \ \ \
| * | | | | Fix `find_by` with range conditionsRyuta Kamizono2017-07-203-4/+12
* | | | | | Merge pull request #29271 from rails/unlock-minitestKasper Timm Hansen2017-08-0222-75/+105
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into unlock-minitestRafael Mendonça França2017-08-012023-2034/+16833
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge pull request #29995 from y-yagi/fix_test_runner_outputKasper Timm Hansen2017-07-302-2/+2
| |\ \ \ \ \ \
| | * | | | | | Fix test runner's outputyuuji.yaginuma2017-07-302-2/+2
| |/ / / / / /
| * | | | | | Merge pull request #29823 from y-yagi/fix_record_not_unique_errorKasper Timm Hansen2017-07-171-20/+20
| |\ \ \ \ \ \
| | * | | | | | Move `reset_pk_sequence!` test to `AdapterTestWithoutTransaction`yuuji.yaginuma2017-07-171-20/+20
| |/ / / / / /
| * | | | | | Merge pull request #29808 from y-yagi/reset_colun_information_after_schema_ch...Kasper Timm Hansen2017-07-161-0/+2
| |\ \ \ \ \ \
| | * | | | | | Reset column information after schema changedyuuji.yaginuma2017-07-161-0/+2
| |/ / / / / /
| * | | | | | Merge pull request #29380 from y-yagi/insert_environment_value_to_table_befor...Kasper Timm Hansen2017-07-151-0/+4
| |\ \ \ \ \ \
| | * | | | | | Insert environment value to `InternalMetadata` after recreating the tableyuuji.yaginuma2017-06-091-0/+4
| * | | | | | | Stupid empty line added after merge.Kasper Timm Hansen2017-07-151-1/+0
| * | | | | | | Bump minitest; Use double quotesKasper Timm Hansen2017-07-152-2/+2
| * | | | | | | Merge branch 'master' into unlock-minitestKasper Timm Hansen2017-07-151037-3778/+6367
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #29479 from yahonda/unlock-minitest_mysql_booleanRafael França2017-06-161-0/+7
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Add teardown to reset_connection at MysqlTypeLookupTestYasuo Honda2017-06-071-0/+7
| |/ / / / / / /
| * | | | | | | Merge pull request #29359 from y-yagi/load_schema_before_assertionMatthew Draper2017-06-061-0/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Load schema before assertionyuuji.yaginuma2017-06-061-0/+6
| |/ / / / / / /
| * | | | | | | Merge pull request #29341 from y-yagi/explicitly_clear_type_map_before_run_testMatthew Draper2017-06-042-10/+12
| |\ \ \ \ \ \ \
| | * | | | | | | Explicitly clear type map before run `test_only_reload_type_map_once_for_ever...yuuji.yaginuma2017-06-032-10/+12
| * | | | | | | | Reset the fixture cache after (re)loading the schemaMatthew Draper2017-06-031-0/+2
| |/ / / / / / /
| * | | | | | | Merge pull request #29332 from yahonda/unlock-minitest_unknown_type_fixRafael França2017-06-021-0/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Clean up `type_map` at the end of test_respond_to_for_non_selected_elementYasuo Honda2017-06-021-0/+5
| * | | | | | | | Merge branch 'master' into unlock-minitestRafael Mendonça França2017-06-0268-338/+459
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #29317 from alexcameron89/fix_persistence_save_testMatthew Draper2017-06-021-21/+7
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Use existing class in PersistenceTest::SaveTestAlex Kitchens2017-06-011-21/+7
| |/ / / / / / / /
| * | | | | | | | Merge pull request #29287 from alexcameron89/fix-db-statement-test-48104Matthew Draper2017-06-011-0/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Reset primary key sequence in FixturesResetPkSequenceTestsAlex Kitchens2017-05-311-0/+1
| * | | | | | | | | Merge pull request #29298 from alexcameron89/minitest-59389Rafael França2017-05-311-0/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Ensure fixtures are loaded for FoxyFixturesTestAlex Kitchens2017-05-311-0/+2
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #29291 from y-yagi/make_sure_to_disable_extension_after_testMatthew Draper2017-05-311-6/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Make sure to disable extension after testyuuji.yaginuma2017-05-311-6/+2
| |/ / / / / / / /
| * | | | | | | | Merge pull request #29277 from y-yagi/reset_time_zone_to_previous_valueKasper Timm Hansen2017-05-301-1/+8
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Reset time zone to previous valueyuuji.yaginuma2017-05-301-1/+8
| |/ / / / / / / /
| * | | | | | | | Merge branch 'master' into unlock-minitestKasper Timm Hansen2017-05-29421-2199/+3517
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #29071 from y-yagi/fix_default_scoping_testKasper Timm Hansen2017-05-281-0/+4
| |\ \ \ \ \ \ \ \ \