aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #27697 from toshimaru/rubocop-updateRafael Mendonça França2017-01-173-7/+7
|\ | | | | | | Update rubocop
| * Rename AlignWith to EnforcedStyleAlignWithtoshimaru2017-01-161-1/+1
| |
| * update rubocop to 0.47toshimaru2017-01-162-6/+6
| |
* | Merge pull request #27717 from JunichiIto/fix-byebug-platformRafael França2017-01-172-1/+5
|\ \ | | | | | | Install Byebug gem as default in Windows (mingw and x64_mingw) platform.
| * | Change `platform` to `platforms`Junichi Ito2017-01-181-1/+1
| | |
| * | Install Byebug gem as default in Windows (mingw and x64_mingw) platform.Junichi Ito2017-01-182-1/+5
| | |
* | | Merge pull request #27716 from kenta-s/remove-unused-variable-regexRafael França2017-01-171-1/+1
|\ \ \ | | | | | | | | Remove unused variable 'regex'
| * | | Remove unused variable 'regex'kenta-s2017-01-181-1/+1
|/ / /
* | | Merge pull request #27712 from coreyward/resolve_decode_test_warningRafael França2017-01-171-2/+7
|\ \ \ | | | | | | | | Use appropriate assertion based on expectation
| * | | Use appropriate assertion based on expectationCorey Ward2017-01-171-2/+7
|/ / / | | | | | | | | | | | | | | | | | | This resolves a stern Minitest “warning” about an upcoming behavior change in MiniTest 6 that will result in the test failing. https://github.com/seattlerb/minitest/issues/666
* | | Move config reset to ensure blockAndrew White2017-01-171-1/+2
| | | | | | | | | | | | We don't want to leak the extra migration path to other railties tests.
* | | Move config reset to ensure blockAndrew White2017-01-171-1/+2
| | | | | | | | | | | | We don't want to leak the extra migration path to other railties tests.
* | | Merge pull request #27674 from kjg/migration_generator_honor_path_configAndrew White2017-01-175-2/+42
|\ \ \ | | | | | | | | Generate migrations at path set by `config.paths["db/migrate"]`
| * | | Generate migrations at path set by `config.paths["db/migrate"]`Kevin Glowacz2017-01-165-2/+42
| | | |
* | | | Merge pull request #27700 from kenta-s/remove-meaningless-line-from-adapter-testAndrew White2017-01-171-1/+0
|\ \ \ \ | | | | | | | | | | Remove meaningless line from adapter_test.rb
| * | | | Remove meaningless line from adapter_test.rbkenta-s2017-01-161-1/+0
| | |_|/ | |/| |
* | | | Merge pull request #24743 from kamipo/sqlite_foreing_key_supportAndrew White2017-01-178-38/+87
|\ \ \ \ | | | | | | | | | | SQLite: Foreign Key Support
| * | | | SQLite: Foreign Key SupportRyuta Kamizono2017-01-176-30/+81
| | | | | | | | | | | | | | | | | | | | https://www.sqlite.org/foreignkeys.html
| * | | | Should work foreign key in test schema without `if supports_foreign_keys?` ↵Ryuta Kamizono2017-01-172-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | statement If an adapter does not support foreign key feature, should be noop. https://github.com/rails/rails/blob/v5.0.0.rc1/activerecord/test/cases/migration/foreign_key_test.rb#L288-L294 https://github.com/rails/rails/blob/v5.0.0.rc1/activerecord/test/cases/migration/references_foreign_key_test.rb#L208-L214
* | | | | Be a bit more explicit rather than relying on the default taskDavid Heinemeier Hansson2017-01-171-1/+1
| | | | |
* | | | | Make yarn install available as a rake task via yarn:install so we can use ↵David Heinemeier Hansson2017-01-171-0/+9
| | | | | | | | | | | | | | | | | | | | that as a dependency for assets:precompile
* | | | | Don't pollute Object with rubinius_skip and jruby_skipAkira Matsuda2017-01-176-55/+55
| | | | | | | | | | | | | | | | | | | | we call them only in the tests
* | | | | All currently supported rubies already have LoadError#pathAkira Matsuda2017-01-171-12/+0
| | | | |
* | | | | :golf: else + if = elsifAkira Matsuda2017-01-171-10/+8
|/ / / /
* | | | Merge pull request #27704 from kmcphillips/transliterate-exceptionRafael França2017-01-163-0/+25
|\ \ \ \ | |_|_|/ |/| | | Raise ArgumentError if attempting to transliterate nil
| * | | CHANGELOG: Raise ArgumentError when calling transliterate on anything other ↵Kevin McPhillips2017-01-161-0/+5
| | | | | | | | | | | | | | | | than a string
| * | | Raise ArgumentError if attempting to transliterate anything that is not a stringKevin McPhillips2017-01-162-0/+20
| | |/ | |/|
* | | s/perfomed/performed/Akira Matsuda2017-01-171-1/+1
| | | | | | | | | | | | [ci skip]
* | | Missing require for strip_heredocAkira Matsuda2017-01-171-0/+1
|/ /
* | Add CHANGELOG entry for #27701Andrew White2017-01-161-0/+4
| |
* | Merge pull request #27701 from kamipo/translate_foreign_key_violationAndrew White2017-01-162-45/+74
|\ \ | | | | | | Translate Foreign Key violation to the specific exception for SQLite3 adapter
| * | Translate Foreign Key violation to the specific exception for SQLite3 adapterRyuta Kamizono2017-01-162-45/+74
| | | | | | | | | | | | | | | | | | Raise `ActiveRecord::InvalidForeignKey` when a record cannot be inserted or updated because it references a non-existent record for SQLite3 adapter.
* | | Merge pull request #27692 from y-yagi/make_render_work_with_ac_paramsEileen M. Uchitelle2017-01-162-2/+5
|\ \ \ | | | | | | | | make `render` work with AC::Params
| * | | make `render` work with AC::Paramsyuuji.yaginuma2017-01-152-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 4.2, since AC::Params inherited `Hash`, processing in the case of `Hash` was done. But in 5.x, since AC::Params does not inherit `Hash`, need to add care for AC::Params. Related to 00285e7cf75c96553719072a27c27e4ab7d25b40
* | | | Merge pull request #27695 from metaskills/sqlserver-testparticipationEileen M. Uchitelle2017-01-163-4/+4
|\ \ \ \ | | | | | | | | | | Allow SQLServerAdapter To Opt Into A Few Tests
| * | | | Allow SQLServerAdapter to opt into a few tests.Ken Collins2017-01-163-4/+4
| | |/ / | |/| |
* | | | Merge pull request #27699 from kenta-s/update-comment-for-scrubber-usageKasper Timm Hansen2017-01-161-6/+4
|\ \ \ \ | |/ / / |/| | | Update comment for Scrubber usage [ci skip]
| * | | Update comment for Scrubber usage [ci skip]kenta-s2017-01-161-6/+4
| | |/ | |/|
* | | Added test to ensure that we dont break #to_h again when trying to restore ↵David Heinemeier Hansson2017-01-161-0/+5
| | | | | | | | | | | | the speed-up from 26dd9b26ab7317f94fd285245879e888344143b2 (cc: @fxn)
* | | Revert "significant speedup of AC::Parameters#permit" ↵David Heinemeier Hansson2017-01-162-8/+1
| | | | | | | | | | | | [26dd9b26ab7317f94fd285245879e888344143b2] as it broke Parameters#to_h on at least fields_for-style nested params.
* | | Add missing requireDavid Heinemeier Hansson2017-01-161-0/+1
|/ / | | | | | | This was preventing the test suite from being run in isolation
* | Should do nothing hereAkira Matsuda2017-01-161-1/+1
| |
* | Merge pull request #27683 from eugeneius/update_counters_empty_touch_testKasper Timm Hansen2017-01-151-0/+9
|\ \ | | | | | | Add test for update_counters with empty touch array
| * | Add test for update_counters with empty touchEugene Kenny2017-01-151-0/+9
| |/ | | | | | | | | | | | | | | | | This is a regression test for a fix included in https://github.com/rails/rails/commit/bad9bfbea6d6af9dc28583e08a49492668087393. Without that change, this test would fail with: ActiveRecord::StatementInvalid: SQLite3::SQLException: near "WHERE": syntax error: UPDATE "topics" SET "replies_count" = COALESCE("replies_count", 0) - 1, WHERE "topics"."id" = ?
* | Revert "Don't guard against `touch: []`."Kasper Timm Hansen2017-01-151-1/+2
| | | | | | | | | | | | | | | | | | | | `timestamp_attributes_for_updates_in_model` returns an empty array when a model has no `updated_at` or `updated_on`. So my previously thought uncommon case is a lot more likely now. This reverts commit a0a1ede8c2eb6436571eae8778033162d1f9dcc3.
* | Merge pull request #27601 from y-yagi/make_work_all_commands_from_engineKasper Timm Hansen2017-01-1510-54/+124
|\ \ | | | | | | Make all rails commands work in engine
| * | improve server default options testyuuji.yaginuma2017-01-091-3/+3
| | | | | | | | | | | | | | | | | | | | | This test was added in 221b4ae. 221b4ae modified to return the same result even if `Rails::Server#default_options` is called more than once. Therefore, also use `Rails::Server#default_options` instead of `ServerCommand#default_options` in test.
| * | make all rails commands work in engineyuuji.yaginuma2017-01-099-51/+121
| | | | | | | | | | | | | | | | | | | | | | | | Currently, all rails commands can be executed in engine, but `server`, `console`, `dbconsole` and `runner` do not work. This make all rails commands work in engine. Related to #22588
* | | Merge pull request #27618 from kamipo/fix_uuid_default_nilKasper Timm Hansen2017-01-152-20/+37
|\ \ \ | | | | | | | | Fix UUID primary key with default nil in legacy migration
| * | | Fix UUID primary key with default nil in legacy migrationRyuta Kamizono2017-01-092-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | UUID primary key with no default value feature (#10404, #18206) was lost in legacy migration caused by #25395 got merged. Restore the feature again in legacy migration.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 22:54:02 +0000