aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* CI against ruby 2.5.0yuuji.yaginuma2017-12-271-1/+8
* SQLite: Add more test cases for adding primary keyRyuta Kamizono2017-12-262-58/+100
* Make `sql_type` of primary key in SQLite to comparable with an integer (#28008)Ryuta Kamizono2017-12-262-2/+2
* Merge pull request #31562 from fatkodima/sqlite_migration_compatibilityRyuta Kamizono2017-12-262-1/+20
|\
| * Fix `add_column` with :primary_key type compatibility for SQLitefatkodima2017-12-252-1/+20
* | Prevent to install gems when run test (#31564)Yuji Yaginuma2017-12-262-4/+12
* | Merge pull request #31563 from Dorian/prevent-shadowing-outer-variablesYuji Yaginuma2017-12-261-4/+4
|\ \ | |/ |/|
| * prevent shadowing outer variablesDorian Marié2017-12-251-4/+4
|/
* Don't pass `object_id` to `refute_nil` since `object_id` never to be nilRyuta Kamizono2017-12-261-6/+6
* Merge pull request #31558 from hsbt/test-rubygems-2.7.4Ryuta Kamizono2017-12-251-1/+1
|\
| * To use rubygems-2.7.4 on Travis CISHIBATA Hiroshi2017-12-251-1/+1
|/
* Merge pull request #27780 from mikelikesbikes/fix-update-attribute-callbacks-...Ryuta Kamizono2017-12-254-5/+15
|\
| * save attributes changed by callbacks after update_attributeMike Busch2017-12-223-5/+11
* | Ensure to use repo's Gemfile in applicationyuuji.yaginuma2017-12-251-0/+5
* | Move `test_skip_bundle` to `AppGeneratorTest`yuuji.yaginuma2017-12-242-9/+9
* | Active Storage: Fix direct uploads in IE 11Javan Makhmali2017-12-232-4/+18
* | Merge pull request #31545 from JanBussieck/add-hwia-inheritance-removal-to-5....Ryuta Kamizono2017-12-231-0/+3
|\ \
| * | [docs] Add mention of removal of HWIA interface from `AC:Parameters`Jan Bussieck2017-12-221-0/+3
* | | Use `delayed_job` masteryuuji.yaginuma2017-12-232-4/+9
* | | Merge pull request #31538 from yhirano55/add_cloud_service_links_to_readme_in...Eileen M. Uchitelle2017-12-221-2/+2
|\ \ \
| * | | Add cloud service's links to README of Active Storage [ci skip]Yoshiyuki Hirano2017-12-221-2/+2
* | | | Merge pull request #31544 from mrreynolds/activestorage-combined-minimagick-o...Eileen M. Uchitelle2017-12-222-6/+30
|\ \ \ \ | |_|/ / |/| | |
| * | | Add support for combined MiniMagick transformationsRobert Glaser2017-12-222-6/+30
* | | | Test that cache stores build unversioned keysGeorge Claghorn2017-12-221-0/+12
* | | | Revert "Remove code duplication in ActiveSupport::Cache"George Claghorn2017-12-221-11/+26
|/ / /
* | | Merge pull request #31543 from hsbt/update-bundler-1-16Ryuta Kamizono2017-12-227-13/+1
|\ \ \
| * | | Revert "Specify bundler version in template files"SHIBATA Hiroshi2017-12-226-12/+0
| * | | Relax bundler version on Travis CISHIBATA Hiroshi2017-12-221-1/+1
| | |/ | |/|
* / | Add test case for using sanitize method in the scope definitionRyuta Kamizono2017-12-221-2/+10
|/ /
* | Merge pull request #31541 from hsbt/fix-travis-failureRyuta Kamizono2017-12-221-1/+1
|\ \
| * | Temporary disabled using rubygems 2.7.SHIBATA Hiroshi2017-12-221-1/+1
|/ /
* | Merge pull request #31537 from yhirano55/pass_options_to_rails_blob_urlRafael França2017-12-211-1/+1
|\ \
| * | Pass options to rails_blob_urlYoshiyuki Hirano2017-12-221-1/+1
| |/
* | Merge pull request #31536 from yhirano55/remove_needless_url_forGeorge Claghorn2017-12-211-1/+1
|\ \ | |/ |/|
| * [ci skip] Remove needless from doc for ActiveStorage::VariantYoshiyuki Hirano2017-12-221-1/+1
|/
* Merge pull request #31530 from 6temes/removes_os_specific_dir_separatorGuillermo Iguaran2017-12-201-1/+1
|\
| * Removes OS specific directory separatorDaniel Lopez2017-12-211-1/+1
|/
* Merge pull request #31520 from yahonda/introduce_frozen_error_classRyuta Kamizono2017-12-208-5/+17
|\
| * Handle `FrozenError` if it is availableYasuo Honda2017-12-208-5/+17
* | Merge pull request #31521 from zinovyev/fix-mysql-get-lock-bigintRyuta Kamizono2017-12-201-2/+2
|\ \
| * | Fix Illegal parameter data type bigint for operation 'get_lock' errorIvan Zinovyev2017-12-201-2/+2
* | | Add test case that configure `config.active_support.hash_digest_class`yuuji.yaginuma2017-12-201-0/+18
|/ /
* | Remove passing needless empty string `options` in `create_table`Ryuta Kamizono2017-12-203-7/+4
* | Place args normalization from `left_outer_joins` to `left_outer_joins!`Ryuta Kamizono2017-12-201-4/+2
* | Merge pull request #31519 from eugeneius/verbose_query_logs_new_framework_def...Ryuta Kamizono2017-12-203-7/+3
|\ \
| * | Remove verbose_query_logs from new_framework_defaults_5_2.rbEugene Kenny2017-12-203-7/+3
|/ /
* | Merge pull request #31177 from albertoalmagro/remove-default-mysql-engine-fro...Matthew Draper2017-12-205-6/+88
|\ \
| * | Remove default ENGINE documentation for MySQL and MariaDBAlberto Almagro2017-12-111-2/+1
| * | Remove default ENGINE=InnoDB for Mysql2 adapterAlberto Almagro2017-12-114-4/+87
* | | Fix `count(:all)` to correctly work `distinct` with custom SELECT listRyuta Kamizono2017-12-204-10/+24