aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* :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
| * | | | | Add `#views` and `#view_exists?` methods on connection adaptersRyuta Kamizono2015-09-136-0/+88
* | | | | | Merge pull request #21607 from kamipo/remove_unnecessary_display_widthJeremy Daer2015-09-197-15/+16
|\ \ \ \ \ \
| * | | | | | Remove unnecessary display widthRyuta Kamizono2015-09-167-15/+16
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #21608 from kamipo/eliminate_duplicated_options_include_de...Jeremy Daer2015-09-192-10/+8
|\ \ \ \ \ \
| * | | | | | Eliminate the duplicated `options_include_default?` methodRyuta Kamizono2015-09-132-10/+8
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #21664 from kamipo/reduce_call_create_table_infoJeremy Daer2015-09-191-2/+7
|\ \ \ \ \ \
| * | | | | | Reduce the calling `create_table_info` queryRyuta Kamizono2015-09-181-2/+7
* | | | | | | Merge pull request #21681 from kamipo/should_test_both_mysql_adaptersJeremy Daer2015-09-194-22/+18
|\ \ \ \ \ \ \
| * | | | | | | Should test both mysql adaptersRyuta Kamizono2015-09-204-22/+18
* | | | | | | | Merge pull request #21677 from ronakjangir47/send_file_headers_testJeremy Daer2015-09-191-1/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Added test for `send_file_headers` called with nil content typeRonak Jangir2015-09-191-1/+12
* | | | | | | | | Merge pull request #21683 from hmistry/aj_travisJeremy Daer2015-09-192-1/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added new lines to run title for easy log readinghiren mistry2015-09-191-1/+1
| * | | | | | | | | Added beanstalkd to Travis so ActiveJob integration tests for beanstalkd can runhiren mistry2015-09-191-0/+5
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | 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
|/ / / / / / / / /