aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove needless blank lines [ci skip]Ryuta Kamizono2017-12-301-2/+0
* Merge pull request #31578 from Aquaj/feature/allow-callables-in-select-group-...George Claghorn2017-12-293-4/+34
|\
| * Allow the use of callable objects as group methods for grouped selects.Jérémie Bonal2017-12-273-4/+34
* | Tweak headings [ci skip]George Claghorn2017-12-291-16/+16
* | Merge pull request #31591 from nobu/patch-2Yuji Yaginuma2017-12-301-8/+1
|\ \
| * | let drb make temprary serverNobuyoshi Nakada2017-12-291-8/+1
* | | Use released `delayed_job` instead of master versionyuuji.yaginuma2017-12-302-9/+4
|/ /
* | Fix `cache_key` with a relation having custom select and orderRyuta Kamizono2017-12-292-2/+7
* | Demonstrate providing keyfile data in lieu of a path [ci skip]George Claghorn2017-12-281-24/+33
* | Link to the client gems [ci skip]George Claghorn2017-12-281-3/+4
* | Merge pull request #31574 from Fudoshiki/patch-1Guillermo Iguaran2017-12-281-0/+5
|\ \
| * | Fix IE 10 and IE 11's broken `preventDefault`Yuri S2017-12-271-0/+5
* | | Remove unused methodsyuuji.yaginuma2017-12-281-16/+0
|/ /
* | Merge pull request #31568 from bogdanvlviv/update-action_view_overview-guideRyuta Kamizono2017-12-271-6/+8
|\ \
| * | Update "Action View Overview" guide [ci skip]bogdanvlviv2017-12-261-6/+8
* | | Merge pull request #31570 from y-yagi/ci_against_250Matthew Draper2017-12-271-1/+8
|\ \ \ | |/ / |/| |
| * | 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
|\ \ \ | |/ / |/| |