aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump license years for 2018Yoshiyuki Hirano2017-12-3121-21/+21
|
* Merge pull request #31602 from eugeneius/config_eager_loadRyuta Kamizono2017-12-313-8/+8
|\ | | | | Clarify that config.eager_load controls eager loading [ci skip]
| * Clarify that config.eager_load controls eager loading [ci skip]Eugene Kenny2017-12-303-8/+8
|/ | | | | | | Before Rails 4.0, `config.cache_classes` determined whether application code was eager loaded. The `config.eager_load` option was introduced to allow the two behaviours to be configured independently, but this documentation was never updated to reflect that change.
* Fix `cache_key` with a relation having distinct and orderRyuta Kamizono2017-12-302-2/+8
| | | | | | | | | | | | | We can't replace existing SELECT list as long as having DISTINCT, it will cause incorrect result. And also, PostgreSQL has a limitation that ORDER BY expressions must appear in select list for SELECT DISTINCT. Therefore, we should not replace existing SELECT list when using DISTINCT. Fixes #29779.
* Remove needless blank lines [ci skip]Ryuta Kamizono2017-12-301-2/+0
| | | | This broke the doc.
* Merge pull request #31578 from ↵George Claghorn2017-12-293-4/+34
|\ | | | | | | | | Aquaj/feature/allow-callables-in-select-group-methods Allow the use of callable objects as group methods for grouped selects.
| * Allow the use of callable objects as group methods for grouped selects.Jérémie Bonal2017-12-273-4/+34
| | | | | | | | | | | | Replaced the uses of `group.send(...)` in `option_groups_from_collection_for_select` by calls to `value_for_collection(group, ...)`, allowing the use of procs, lambdas and other callable objects as parameters.
* | 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 server
| * | let drb make temprary serverNobuyoshi Nakada2017-12-291-8/+1
| | |
* | | Use released `delayed_job` instead of master versionyuuji.yaginuma2017-12-302-9/+4
|/ / | | | | | | Ref: https://github.com/collectiveidea/delayed_job/blob/master/CHANGELOG.md#414---2017-12-29
* | Fix `cache_key` with a relation having custom select and orderRyuta Kamizono2017-12-292-2/+7
| | | | | | | | We can't replace existing select list as long as referenced by ORDER BY.
* | 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` for rails-ujs
| * | Fix IE 10 and IE 11's broken `preventDefault`Yuri S2017-12-271-0/+5
| | | | | | | | | | | | https://github.com/turbolinks/turbolinks/issues/233 https://stackoverflow.com/questions/23349191/event-preventdefault-is-not-working-in-ie-11-for-custom-events
* | | Remove unused methodsyuuji.yaginuma2017-12-281-16/+0
|/ / | | | | | | | | * `assert_header` and `assert_body` were unused since 6f6a589. * `assert_success` and `assert_missing` were unused since added.
* | Merge pull request #31568 from bogdanvlviv/update-action_view_overview-guideRyuta Kamizono2017-12-271-6/+8
|\ \ | | | | | | Update "Action View Overview" guide [ci skip]
| * | Update "Action View Overview" guide [ci skip]bogdanvlviv2017-12-261-6/+8
| | | | | | | | | | | | | | | | | | - Provide full / Fix generated HTML by `form_for` in the example. - Provide full params in the example. - Express params[:person] in the sentence.
* | | Merge pull request #31570 from y-yagi/ci_against_250Matthew Draper2017-12-271-1/+8
|\ \ \ | |/ / |/| | CI against ruby 2.5.0
| * | 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
| | | | | | | | | | Originally I tried to add `assert_equal pk.sql_type, ref.sql_type`. But the assert failed even though the same type due to `sql_type` of primary key in SQLite is upper case. Prefer lower case like other types.
* | Merge pull request #31562 from fatkodima/sqlite_migration_compatibilityRyuta Kamizono2017-12-262-1/+20
|\ \ | | | | | | Fix `add_column` with :primary_key type compatibility for SQLite
| * | 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
| | | | | | | | | | | | | | | | | | `invoke_all` cause `bundle install`. This will install gems actually defined in `Gemfile`. To avoid this, stubbed `bundle_command`. Fixes #31557
* | | Merge pull request #31563 from Dorian/prevent-shadowing-outer-variablesYuji Yaginuma2017-12-261-4/+4
|\ \ \ | |/ / |/| | Prevent shadowing outer variables
| * | 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
| | | | | | | | And prefer `assert_same` over `assert_equal`.
* | Merge pull request #31558 from hsbt/test-rubygems-2.7.4Ryuta Kamizono2017-12-251-1/+1
|\ \ | | | | | | Try to update rubygems 2.7.4
| * | To use rubygems-2.7.4 on Travis CISHIBATA Hiroshi2017-12-251-1/+1
|/ /
* | Merge pull request #27780 from ↵Ryuta Kamizono2017-12-254-5/+15
|\ \ | | | | | | | | | | | | | | | mikelikesbikes/fix-update-attribute-callbacks-issue save attributes changed by callbacks after update_attribute
| * | save attributes changed by callbacks after update_attributeMike Busch2017-12-223-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | update_attribute previously stopped execution, before saving and before running callbacks, if the record's attributes hadn't changed. [The documentation](http://api.rubyonrails.org/classes/ActiveRecord/Persistence.html#method-i-update_attribute) says that "Callbacks are invoked", which was not happening if the persisted attributes hadn't changed.
* | | Ensure to use repo's Gemfile in applicationyuuji.yaginuma2017-12-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Puma gets bundler's info from `Bundler::ORIGINAL_ENV` for restart. https://github.com/puma/puma/blob/f6f3892f4d82638fb7a2a57d993641b1486ee88a/lib/puma/launcher.rb#L168 So, specified `BUNDLE_GEMFILE` env for use same Gemfile in the restart. Fixes #31351
* | | Move `test_skip_bundle` to `AppGeneratorTest`yuuji.yaginuma2017-12-242-9/+9
| | | | | | | | | | | | `skip_bundle` option was removed from plugin generator in 9b72fcc3c22a6f75f37f52dd6cb682bc00c51cf0.
* | | Active Storage: Fix direct uploads in IE 11Javan Makhmali2017-12-232-4/+18
| | | | | | | | | | | | | | | Fixes #31531 Closes #31540
* | | Merge pull request #31545 from ↵Ryuta Kamizono2017-12-231-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | JanBussieck/add-hwia-inheritance-removal-to-5.1-release-notes [docs] Add mention of removal of HWIA interface from `AC:Parameters` [ci skip]
| * | | [docs] Add mention of removal of HWIA interface from `AC:Parameters`Jan Bussieck2017-12-221-0/+3
| | | | | | | | | | | | | | | | [ci skip]
* | | | Use `delayed_job` masteryuuji.yaginuma2017-12-232-4/+9
| | | | | | | | | | | | | | | | | | | | For pass Active Job integration tests with Ruby 2.5. Ref: https://github.com/collectiveidea/delayed_job/pull/996
* | | | Merge pull request #31538 from ↵Eileen M. Uchitelle2017-12-221-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | yhirano55/add_cloud_service_links_to_readme_in_active_storage Add cloud service's links to README of Active Storage [ci skip]
| * | | | Add cloud service's links to README of Active Storage [ci skip]Yoshiyuki Hirano2017-12-221-2/+2
| | | | |
* | | | | Merge pull request #31544 from ↵Eileen M. Uchitelle2017-12-222-6/+30
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | mrreynolds/activestorage-combined-minimagick-options Add support for combined MiniMagick transformations
| * | | | 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
|/ / / / | | | | | | | | | | | | This reverts commit 57f0e3d1300d01444d2a311560c055d26968dc3f.
* | | | Merge pull request #31543 from hsbt/update-bundler-1-16Ryuta Kamizono2017-12-227-13/+1
|\ \ \ \ | | | | | | | | | | Relax bundler version on Travis CI
| * | | | Revert "Specify bundler version in template files"SHIBATA Hiroshi2017-12-226-12/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit b106242f52272c4a5ced7a0e9d1dcb1b50542501.
| * | | | 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
|/ / / | | | | | | | | | Context: https://github.com/rails/rails/pull/29301#issuecomment-353200233
* | | Merge pull request #31541 from hsbt/fix-travis-failureRyuta Kamizono2017-12-221-1/+1
|\ \ \ | | | | | | | | Temporary disabled using rubygems 2.7.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 12:55:54 +0000