aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [Action Mailer] require_relative => requireAkira Matsuda2017-10-212-4/+4
| | | | This basically reverts cd9cc721ab54e2b0c7875cacf2113f03908a8bb7
* [Action View] require_relative => requireAkira Matsuda2017-10-2125-35/+35
| | | | This basically reverts c4d1a4efeec6f0b5b58222993aa0bec85a19b6a8
* [Action Pack] require => require_relativeAkira Matsuda2017-10-2137-70/+70
| | | | | This basically reverts e9fca7668b9eba82bcc832cb0061459703368397, d08da958b9ae17d4bbe4c9d7db497ece2450db5f, d1fe1dcf8ab1c0210a37c2a78c1ee52cf199a66d, and 68eaf7b4d5f2bb56d939f71c5ece2d61cf6680a3
* [Active Record] require => require_relativeAkira Matsuda2017-10-2135-134/+134
| | | | This basically reverts 9d4f79d3d394edb74fa2192e5d9ad7b09ce50c6d
* [Active Model] require => require_relativeAkira Matsuda2017-10-217-25/+25
| | | | This basically reverts ee5cfc01a5797f854c8441539b0cae326a81b963
* [Active Support] require_relative => requireAkira Matsuda2017-10-21129-386/+386
| | | | This basically reverts 8da30ad6be34339124ba4cb4e36aea260dda12bc
* [Railties] require_relative => requireAkira Matsuda2017-10-2174-115/+115
| | | | This basically reverts 618268b4b9382f4bcf004a945fe2d85c0bd03e32
* Let Hash#slice return a HashAkira Matsuda2017-10-212-1/+5
| | | | | | | In order to keep this method compatible with the Ruby 2.5 version of Hash#slice. This bahavior is actually slightly incompatibile with previous versions of Active Support but it might not cause a real problem, since HWIA, the biggest use case of Hash subclassing here, already overrides `slice` to return another HWIA.
* Move HWIA specific logic for slice and slice! to HWIA classAkira Matsuda2017-10-212-2/+10
|
* Hash#slice is in Ruby 2.5+Akira Matsuda2017-10-211-1/+1
| | | | since r60229
* Add test cases for `type` and `foreign_type` in the reflectionsRyuta Kamizono2017-10-211-0/+7
| | | | It should be initialized only when polymorphic associations.
* bundle lock --add-platform javaAkira Matsuda2017-10-201-0/+27
| | | | "The dependency activerecord-jdbcsqlite3-adapter (>= 1.3.0) will be unused by any of the platforms Bundler is installing for. Bundler is installing for ruby, x64-mingw32, x86-mingw32 but the dependency is only for java. To add those platforms to the bundle, run `bundle lock --add-platform java`."
* Merge pull request #30928 from Altech/indifferent-ignored-columnsRyuta Kamizono2017-10-203-15/+37
|\ | | | | Allow symbol list for ignored_columns
| * Convert ignored_columns to a list of stringAltech2017-10-203-15/+37
| |
* | Merge pull request #30936 from maxfelsher/html-escape-doc-fixRyuta Kamizono2017-10-201-3/+0
|\ \ | | | | | | Remove obsolete documentation for html_escape [ci skip]
| * | Remove obsolete documentation [ci skip]Max Felsher2017-10-191-3/+0
| | | | | | | | | | | | | | | Instructions to use `h` or `html_escape` in ERB templates were added to `actionpack/lib/action_view/template_handlers/erb.rb` in a1b0349 (Rails 2.1), but ERB has automatically escaped values since Rails 3.
* | | Merge pull request #30938 from y-yagi/_return_correct_exit_status_of_ujs_testRyuta Kamizono2017-10-201-1/+1
|\ \ \ | |/ / |/| | Return correct exit status of ujs test
| * | Return correct exit status of ujs testyuuji.yaginuma2017-10-201-1/+1
|/ / | | | | | | | | | | The `Process::Status#to_i` returns the bits in stat. If need exit status, need to use `#exitstatus`. Ref: https://ruby-doc.org/core-2.4.0/Process/Status.html#method-i-to_i
* | Keep `:api: plugin` methods in the doc [ci skip]Ryuta Kamizono2017-10-202-5/+5
| | | | | | | | | | | | | | `:api:` tag was removed in 5349f231 since RDoc doesn't support `:api:` tag. But those methods are not private API, they are public API for renderers. The renderers should be able to know that they can override this method.
* | Merge pull request #30930 from rails/replace-phantomjs-with-chromeGuillermo Iguaran2017-10-196-151/+31
|\ \ | |/ |/| PhantomJS is abandoned, replace it with Selenium/Chrome headless
| * Count assertions instead of tests in reportGuillermo Iguaran2017-10-191-1/+1
| |
| * PhantomJS is abandoned, replace it with Selenium/Chrome headlessGuillermo Iguaran2017-10-196-151/+31
|/
* Merge pull request #29127 from DmytroVasin/rails-ujs-remote-callbacksGuillermo Iguaran2017-10-193-69/+34
|\ | | | | Fix callback in rails ujs
| * Fix callback in rails ujsVasin Dmitriy2017-06-073-69/+34
| |
* | Test `ignored_columns` value is inheritable by subclassesRyuta Kamizono2017-10-192-0/+10
| |
* | Merge pull request #30927 from y-yagi/remove_unused_fixture_templateRyuta Kamizono2017-10-191-11/+0
|\ \ | | | | | | Remove unused `FixtureTemplate` class
| * | Remove unused `FixtureTemplate` classyuuji.yaginuma2017-10-191-11/+0
|/ / | | | | | | `FixtureTemplate` is no longer used since 3d7892d.
* | Merge pull request #30579 from ↵Sean Griffin2017-10-184-12/+83
|\ \ | | | | | | | | | | | | bogdanvlviv/fix_ar_internal_metadata_for_a_test_database Fix `bin/rails db:setup` and `bin/rails db:test:prepare` create wrong ar_internal_metadata's data for a test database.
| * | `ActiveRecord::Tasks::DatabaseTasks.load_schema` has always to establish ↵bogdanvlviv2017-10-152-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | database connection When load schema from `structure.sql`, database connection isn't established. `ActiveRecord::Tasks::DatabaseTasks.load_schema` has to establish database connection since it executes ``` ActiveRecord::InternalMetadata.create_table ActiveRecord::InternalMetadata[:environment] = environment ```
| * | Fix `bin/rails db:setup` and `bin/rails db:test:prepare` create wrong ↵bogdanvlviv2017-10-154-9/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ar_internal_metadata's data for a test database. Before: ``` $ RAILS_ENV=test rails dbconsole > SELECT * FROM ar_internal_metadata; key|value|created_at|updated_at environment|development|2017-09-11 23:14:10.815679|2017-09-11 23:14:10.815679 ``` After: ``` $ RAILS_ENV=test rails dbconsole > SELECT * FROM ar_internal_metadata; key|value|created_at|updated_at environment|test|2017-09-11 23:14:10.815679|2017-09-11 23:14:10.815679 ``` Fixes #26731.
* | | Merge pull request #30923 from rails/chromedriverhelperGuillermo Iguaran2017-10-182-0/+4
|\ \ \ | | | | | | | | Improve out-of-box experience with System tests including chromedriver-helper by default
| * | | Improve out-of-box experience with System tests including ↵Guillermo Iguaran2017-10-182-0/+4
| | | | | | | | | | | | | | | | chromedriver-helper by default
* | | | Merge pull request #30918 from yahonda/diag_seed_42296Ryuta Kamizono2017-10-191-0/+2
|\ \ \ \ | |/ / / |/| | | Enable `hstore` extention disabled at the end of `test_migrate_enable_and_disable_extension`
| * | | Enable `hstore` extention disabled at the end of ↵Yasuo Honda2017-10-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `InvertibleMigrationTest#test_migrate_enable_and_disable_extension` to avoid failure of `PostgresqlArrayTest#test_schema_dump_with_shorthand` which expects `hstore` extension enabled.
* | | | Merge pull request #30915 from ↵Ryuta Kamizono2017-10-182-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | bogdanvlviv/migration-version-in-bug_report_templates Set proper migration' version in bug report templates
| * | | | Set proper migration' version in bug report templatesbogdanvlviv2017-10-182-2/+2
|/ / / /
* | | | Merge pull request #30914 from ↵Eileen M. Uchitelle2017-10-181-0/+11
|\ \ \ \ | |/ / / |/| | | | | | | | | | | bogdanvlviv/active_record_basics-guides-add-destroy_all Add mention how to delete several records in bulk to Active Record Basics Guides [ci skip]
| * | | Add mention how to delete several records in bulk to Active Record Basics ↵bogdanvlviv2017-10-181-0/+11
|/ / / | | | | | | | | | Guides [ci skip]
* | | Merge pull request #30912 from y-yagi/remove_unused_unknown_controllerRyuta Kamizono2017-10-181-3/+0
|\ \ \ | | | | | | | | Remove unused `UnknownController` class
| * | | Remove unused `UnknownController` classyuuji.yaginuma2017-10-181-3/+0
| | | | | | | | | | | | | | | | `UnknownController` was added in b1999be, but it is not used anywhere.
* | | | Merge pull request #30911 from y-yagi/remove_unnecessary_allow_failure_trueRyuta Kamizono2017-10-181-1/+1
|\ \ \ \ | | | | | | | | | | Remove unnecessary `allow_failure: true` option
| * | | | Remove unnecessary `allow_failure: true` optionyuuji.yaginuma2017-10-181-1/+1
| |/ / / | | | | | | | | | | | | | | | | `routes` task always returns zero to status, so status is not to non-zeno. Ref: https://github.com/rails/rails/blob/b1867c480dd5476948ff0492ea2f91e2c2fcb04b/railties/lib/rails/tasks/routes.rake#L30
* | | | Merge pull request #30910 from y-yagi/fix_typo_in_allow_failure_argumentRyuta Kamizono2017-10-181-1/+1
|\ \ \ \ | |/ / / |/| | | Fix typo in `allow_failure` argument [ci skip]
| * | | Fix typo in `allow_failure` argument [ci skip]yuuji.yaginuma2017-10-181-1/+1
|/ / / | | | | | | | | | Ref: https://github.com/rails/rails/blob/3be123ba26cad461a80d7d680819e71c1388a241/railties/test/isolation/abstract_unit.rb#L243
* | | Should test `LegacyPrimaryKeyTest` to both `V5_0` and `V4_2`Ryuta Kamizono2017-10-181-15/+34
| | |
* | | Merge pull request #30909 from ahorek/compatibility_fixRyuta Kamizono2017-10-182-1/+4
|\ \ \ | | | | | | | | 42 compatibility - use int instead of bigint
| * | | compatibility - use int instead of bigintpavel2017-10-182-1/+4
| | | |
* | | | Merge pull request #30876 from y-yagi/selenium_chrome_headlessEileen M. Uchitelle2017-10-176-1/+41
|\ \ \ \ | |/ / / |/| | | Add headless chrome driver to System Tests
| * | | Add headless chrome driver to System Testsyuuji.yaginuma2017-10-176-1/+41
| | | |
* | | | Merge pull request #30907 from yhirano55/update_mailing_list_url_in_i18n_guideRyuta Kamizono2017-10-171-3/+3
|\ \ \ \ | | | | | | | | | | Update mailing list URL in I18n guide [ci skip]