Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #29415 from kamipo/remove_unused_defined_association | Guillermo Iguaran | 2017-06-16 | 2 | -2/+1 |
|\ | |||||
| * | Remove unused defined association | Ryuta Kamizono | 2017-06-11 | 2 | -2/+1 |
* | | Merge pull request #29455 from kirs/remove-column-with-fk-mysql | Guillermo Iguaran | 2017-06-16 | 2 | -0/+17 |
|\ \ | |||||
| * | | Remove FK together with column in MySQL | Kir Shatrov | 2017-06-16 | 2 | -0/+17 |
* | | | Merge pull request #29392 from alexcameron89/unpersisted_create_association | Matthew Draper | 2017-06-17 | 3 | -1/+14 |
|\ \ \ | |||||
| * | | | Raise on create for singular association when parent is unpersisted | Alex Kitchens | 2017-06-08 | 3 | -1/+14 |
* | | | | Merge pull request #29431 from kamipo/fix_create_table_with_query_from_relation | Matthew Draper | 2017-06-17 | 2 | -7/+10 |
|\ \ \ \ | |||||
| * | | | | Fix `create_table` with query from relation | Ryuta Kamizono | 2017-06-13 | 2 | -7/+10 |
* | | | | | Merge pull request #29461 from dnl/unscope_where_or | Matthew Draper | 2017-06-17 | 2 | -1/+26 |
|\ \ \ \ \ | |||||
| * | | | | | Don't require 'unscope' to be the same for both sides of a 'or' relation. | Dan Sherson | 2017-06-15 | 2 | -1/+26 |
* | | | | | | Merge pull request #29470 from kamipo/use_nullable_column_instead_of_primary_key | Matthew Draper | 2017-06-17 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use nullable `id` column instead of a primary key | Ryuta Kamizono | 2017-06-16 | 1 | -1/+2 |
* | | | | | | | Remove references to deprecared raise_runtime_errors from documentation, whic... | Vipul A M | 2017-06-17 | 2 | -16/+0 |
* | | | | | | | Merge pull request #29482 from Edouard-chin/test-load-path | Rafael França | 2017-06-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add the `<app_root>/test` dir to the `$LOAD_PATH` as a string: | Edouard CHIN | 2017-06-16 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #29140 from notEthan/log_subscribed_avoid_rescuing | Rafael França | 2017-06-16 | 1 | -2/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | check that logger is defined in log subscriber rescue before logging | Ethan | 2017-05-24 | 1 | -1/+3 |
| * | | | | | | | lob subscriber should only rescue StandardError, not Exception | Ethan | 2017-05-24 | 1 | -1/+1 |
* | | | | | | | | Fix formatting of `ActionMailer::MessageDelivery` doc [ci skip] | Ryuta Kamizono | 2017-06-16 | 1 | -4/+4 |
* | | | | | | | | Merge pull request #29471 from halogenandtoast/mm-mailer-delayed-job-document... | Guillermo Iguaran | 2017-06-15 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Document setting the delivery_job for ActionMailer [ci skip] | Matthew Mongeau | 2017-06-16 | 1 | -0/+16 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #29447 from shotat/feature/enhance_active_model | Rafael França | 2017-06-15 | 1 | -2/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | add frozen string literal comment | shotat | 2017-06-15 | 1 | -1/+3 |
| * | | | | | | | freeze string | shotat | 2017-06-14 | 1 | -1/+1 |
| * | | | | | | | enhance active model assignment | shotat | 2017-06-14 | 1 | -2/+3 |
* | | | | | | | | Merge pull request #29464 from eugeneius/raw_write_attribute | Rafael França | 2017-06-15 | 2 | -15/+12 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Don't map id to primary key in raw_write_attribute | Eugene Kenny | 2017-06-15 | 2 | -15/+12 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #29462 from kamipo/fix_dump_schema_information_with_empty_... | Rafael França | 2017-06-15 | 2 | -1/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix `dump_schema_information` with empty versions | Ryuta Kamizono | 2017-06-15 | 2 | -1/+7 |
* | | | | | | | | | Fix indentation [ci skip] | Ryuta Kamizono | 2017-06-15 | 1 | -6/+7 |
* | | | | | | | | | Merge pull request #29453 from kamipo/add_test_case_for_28274 | Guillermo Iguaran | 2017-06-15 | 1 | -0/+46 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add test cases for #28274 | Ryuta Kamizono | 2017-06-15 | 1 | -0/+46 |
* | | | | | | | | | | Merge pull request #29457 from halogenandtoast/mm-configure_delivery_job | Guillermo Iguaran | 2017-06-15 | 4 | -1/+26 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Allow mailers to configure their delivery job | Matthew Mongeau | 2017-06-15 | 4 | -1/+26 |
* | | | | | | | | | | Remove deprecated option from docs [ci skip] (#29459) | Vipul A M | 2017-06-15 | 1 | -6/+6 |
| |_|/ / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge pull request #29442 from DmytroVasin/rails-ujs-docs | Vipul A M | 2017-06-15 | 1 | -0/+29 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Updated `working with javascript` readme to support the behavior of rails-ujs. | Dmytro Vasin | 2017-06-15 | 1 | -0/+29 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #29409 from eugeneius/skip_test_uuid_column_default | Rafael França | 2017-06-15 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Allow `uuid_test.rb` to be loaded on all adapters | Eugene Kenny | 2017-06-14 | 1 | -1/+2 |
* | | | | | | | | | Merge pull request #29452 from kamipo/prevent_extra_sync_with_transaction_state | Rafael França | 2017-06-15 | 1 | -5/+2 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Prevent extra `sync_with_transaction_state` | Ryuta Kamizono | 2017-06-15 | 1 | -5/+2 |
* | | | | | | | | | Merge pull request #29451 from vipulnsward/29441-flatten-default | Rafael França | 2017-06-14 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Allow translate default option to accept an array similar to i18n.t. Fixes #2... | Vipul A M | 2017-06-15 | 2 | -1/+2 |
* | | | | | | | | | Merge pull request #29378 from kamipo/avoid_overwriting_id_attribute_methods | Rafael França | 2017-06-14 | 4 | -19/+24 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Avoid overwriting the methods of `AttributeMethods::PrimaryKey` | Ryuta Kamizono | 2017-06-07 | 4 | -19/+24 |
* | | | | | | | | | | Merge pull request #29417 from bogdanvlviv/use-require_relative-instead-of_re... | Matthew Draper | 2017-06-15 | 21 | -26/+26 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Use `require_relative` instead of `require` with full path | bogdanvlviv | 2017-06-14 | 21 | -26/+26 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge pull request #29438 from koic/add_migration_compatibility_test | Rafael França | 2017-06-13 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Add test for backward compatibility when using change_table | Koichi ITO | 2017-06-13 | 1 | -0/+15 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #29435 from y-yagi/fix_formatting_of_action_dispatch | Ryuta Kamizono | 2017-06-13 | 1 | -7/+7 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | |