aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Require dependencies from stdlib in the Decimal typeSean Griffin2015-09-211-0/+2
* We still need the `Helpers` constant in the `ActiveRecord` namespaceSean Griffin2015-09-211-0/+1
* Remove no-op options being passed in AM type registrationsSean Griffin2015-09-211-11/+11
* Merge pull request #21533Sean Griffin2015-09-2142-426/+655
|\
| * Move the appropriate type tests to the Active Model suiteSean Griffin2015-09-219-225/+263
| * Simplify the implementation of Active Model's type registrySean Griffin2015-09-213-103/+60
| * Various stylistic nitpicksSean Griffin2015-09-217-46/+43
| * `TypeMap` and `HashLookupTypeMap` shouldn't be in Active ModelSean Griffin2015-09-214-8/+5
| * Move ActiveRecord::Type to ActiveModelKir Shatrov2015-09-2131-96/+336
|/
* Merge pull request #21612 from ronakjangir47/remove_unused_paramsSean Griffin2015-09-211-2/+2
|\
| * Removed unused parameter `options` for `register_detail` methodRonak Jangir2015-09-131-2/+2
* | Update to latest turbolinksAndrew White2015-09-211-1/+1
* | Use Sidekiq.options to set initial waitAndrew White2015-09-211-1/+1
* | Run `rake db:migrate` for all Active Job integration testsAndrew White2015-09-211-1/+2
* | Silence logging in Active Job unit testsAndrew White2015-09-211-0/+1
* | Use master version of Turbolinks gemAndrew White2015-09-212-4/+10
* | Short-circuit `blank?` on date and time valuesAndrew White2015-09-217-1/+48
* | Merge pull request #21684 from amitsuroliya/correct_resultAndrew White2015-09-211-6/+4
|\ \
| * | Applying right result of examples in ActiveSupport Multibyte [ci skip]amitkumarsuroliya2015-09-211-6/+4
* | | Merge pull request #21693 from joshuapinter/patch-1Jeremy Daer2015-09-201-0/+2
|\ \ \
| * | | Add title for key lengths for multiple keys.Joshua Pinter2015-09-201-0/+2
* | | | Merge pull request #21694 from harrykiselev/patch-2Jeremy Daer2015-09-201-0/+1
|\ \ \ \
| * | | | Update routing.rbHarry V. Kiselev2015-09-201-0/+1
* | | | | Merge pull request #20009 from kamipo/foreign_keys_in_createJeremy Daer2015-09-203-17/+33
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Support for foreign keys in create tableRyuta Kamizono2015-09-203-17/+33
| | |/ / | |/| |
* | | | Merge pull request #21687 from kamipo/refactor_table_existsAndrew White2015-09-203-27/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | Refactor `table_exists?` in AbstractMysqlAdapterRyuta Kamizono2015-09-203-27/+10
| |/ /
* | | :hocho: TyposAkira Matsuda2015-09-216-6/+6
* | | TypppoAkira Matsuda2015-09-211-3/+3
* | | :scissors: empty line at the top of filesAkira Matsuda2015-09-219-9/+0
* | | Merge pull request #21689 from y-yagi/fix_application_controller_require_depe...Andrew White2015-09-202-1/+2
|\ \ \
| * | | fix application_controller require_dependency path generated by the scaffold ...yuuji.yaginuma2015-09-202-1/+2
| |/ /
* | | Merge pull request #21691 from amitsuroliya/guide_fixesKasper Timm Hansen2015-09-201-3/+3
|\ \ \
| * | | fix `to_time` output in ActiveSupport guide. Since https://github.com/rails/r...amitkumarsuroliya2015-09-201-3/+3
|/ / /
* | | Merge pull request #21690 from amitsuroliya/typo_fixRobin Dupret2015-09-201-2/+2
|\ \ \
| * | | correcting word smpt -> smtp in ActionMailer guide [ci skip]amitkumarsuroliya2015-09-201-2/+2
|/ / /
* | | Merge pull request #21685 from y-yagi/remove_force_reload_option_from_guideClaudio B.2015-09-191-12/+20
|\ \ \ | |/ / |/| |
| * | remove association reload option from guide [ci skip]yuuji.yaginuma2015-09-201-12/+20
|/ /
* | Merge pull request #17696 from kamipo/unsigned_integer_supportJeremy Daer2015-09-195-9/+144
|\ \
| * | Add `unsigned` types for numeric data types in MySQLRyuta Kamizono2015-09-184-0/+56
| * | Add `unsigned` support for numeric data types in MySQLRyuta Kamizono2015-09-185-9/+91
* | | Merge pull request #19086 from kamipo/move_explain_into_abstract_mysql_adapterJeremy Daer2015-09-194-78/+113
|\ \ \
| * | | Move `explain` into `AbstractMysqlAdapter`Ryuta Kamizono2015-03-014-78/+113
* | | | Merge pull request #20645 from kamipo/fix_mysql_set_type_bugJeremy Daer2015-09-192-1/+10
|\ \ \ \
| * | | | Fix infinite loop and lookup miss when `SET` type includes other typesRyuta Kamizono2015-06-201-1/+6
| * | | | Fix the MySQL column type `SET` registration bugTaishi Kasuga2015-06-201-0/+4
* | | | | Merge pull request #21589 from kamipo/eliminate_duplicated_visit_table_defini...Jeremy Daer2015-09-192-16/+6
|\ \ \ \ \
| * | | | | Eliminate the duplication code of `visit_TableDefinition`Ryuta Kamizono2015-09-162-18/+13
* | | | | | Merge pull request #21609 from kamipo/do_not_dump_view_as_tableJeremy Daer2015-09-197-1/+102
|\ \ \ \ \ \
| * | | | | | Do not dump a view as a table in sqlite3, mysql and mysql2 adaptersRyuta Kamizono2015-09-132-1/+14