aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add the `<app_root>/test` dir to the `$LOAD_PATH` as a string:Edouard CHIN2017-06-161-1/+1
| | | | - [Rails <= 5.0](https://github.com/rails/rails/blob/5-0-stable/railties/lib/rails/commands/test.rb#L6) used to add the `<app_root>/test` as a string; this behaviour changed in rails 5.1, it's appending a `Pathname` object
* Merge pull request #29140 from notEthan/log_subscribed_avoid_rescuingRafael França2017-06-161-2/+4
|\ | | | | Log subscriber - avoid rescuing certain exceptions
| * check that logger is defined in log subscriber rescue before loggingEthan2017-05-241-1/+3
| |
| * lob subscriber should only rescue StandardError, not ExceptionEthan2017-05-241-1/+1
| |
* | Fix formatting of `ActionMailer::MessageDelivery` doc [ci skip]Ryuta Kamizono2017-06-161-4/+4
| |
* | Merge pull request #29471 from ↵Guillermo Iguaran2017-06-151-0/+16
|\ \ | | | | | | | | | | | | halogenandtoast/mm-mailer-delayed-job-documentation Document setting the delivery_job for ActionMailer [ci skip]
| * | Document setting the delivery_job for ActionMailer [ci skip]Matthew Mongeau2017-06-161-0/+16
|/ /
* | Merge pull request #29447 from shotat/feature/enhance_active_modelRafael França2017-06-151-2/+5
|\ \ | | | | | | [ActiveModel] Improve the performance of mass assignments
| * | add frozen string literal commentshotat2017-06-151-1/+3
| | |
| * | freeze stringshotat2017-06-141-1/+1
| | |
| * | enhance active model assignmentshotat2017-06-141-2/+3
| | |
* | | Merge pull request #29464 from eugeneius/raw_write_attributeRafael França2017-06-152-15/+12
|\ \ \ | | | | | | | | Don't map id to primary key in raw_write_attribute
| * | | Don't map id to primary key in raw_write_attributeEugene Kenny2017-06-152-15/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `raw_write_attribute` method is used to update a record's attributes to reflect the new state of the database in `update_columns`. The hash provided to `update_columns` is turned into an UPDATE query directly, which means passing an `id` key results in an update to the `id` column, even if the model uses a different attribute as its primary key. When updating the record, we don't want to apply the `id` column change to the primary key attribute, since that's not what happened in the query. Without the code to handle this case, `write_attribute_with_type_cast` no longer contains any logic shared between `raw_write_attribute` and `write_attribute`, so we can inline the code into those two methods.
* | | | Merge pull request #29462 from ↵Rafael França2017-06-152-1/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | kamipo/fix_dump_schema_information_with_empty_versions Fix `dump_schema_information` with empty versions
| * | | | Fix `dump_schema_information` with empty versionsRyuta Kamizono2017-06-152-1/+7
| | | | | | | | | | | | | | | | | | | | Fixes #29460.
* | | | | Fix indentation [ci skip]Ryuta Kamizono2017-06-151-6/+7
| | | | |
* | | | | Merge pull request #29453 from kamipo/add_test_case_for_28274Guillermo Iguaran2017-06-151-0/+46
|\ \ \ \ \ | | | | | | | | | | | | Add test cases for #28274
| * | | | | Add test cases for #28274Ryuta Kamizono2017-06-151-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `object.id` is correctly restored since #29378 has merged. Closes #28274, Closes #28395. [Ryuta Kamizono & Eugene Kenny]
* | | | | | Merge pull request #29457 from halogenandtoast/mm-configure_delivery_jobGuillermo Iguaran2017-06-154-1/+26
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Allow mailers to configure their delivery job
| * | | | | Allow mailers to configure their delivery jobMatthew Mongeau2017-06-154-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting delivery_job on a mailer class will cause MessageDelivery to use the specified job instead of ActionMailer::DeliveryJob: class MyMailer < ApplicationMailer self.delivery_job = MyCustomDeliveryJob ... end
* | | | | | Remove deprecated option from docs [ci skip] (#29459)Vipul A M2017-06-151-6/+6
| |_|/ / / |/| | | |
* | | | | Merge pull request #29442 from DmytroVasin/rails-ujs-docsVipul A M2017-06-151-0/+29
|\ \ \ \ \ | |/ / / / |/| | | | Update `working with javascript` readme to support rails-ujs behaviour. [ci skip]
| * | | | Updated `working with javascript` readme to support the behavior of rails-ujs.Dmytro Vasin2017-06-151-0/+29
| | | | |
* | | | | Merge pull request #29409 from eugeneius/skip_test_uuid_column_defaultRafael França2017-06-151-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Allow `uuid_test.rb` to be loaded on all adapters
| * | | | | Allow `uuid_test.rb` to be loaded on all adaptersEugene Kenny2017-06-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running `bin/test` from the activerecord directory produces this error: test/cases/adapters/postgresql/uuid_test.rb:43:in `<class:PostgresqlUUIDTest>': undefined method `supports_pgcrypto_uuid?' for #<ActiveRecord::ConnectionAdapters::SQLite3Adapter:0x007fc405e72a68> (NoMethodError) The test only actually runs on the PostgreSQL adapter; we can avoid triggering the error on other adapters with this `respond_to?` guard.
* | | | | | Merge pull request #29452 from kamipo/prevent_extra_sync_with_transaction_stateRafael França2017-06-151-5/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Prevent extra `sync_with_transaction_state`
| * | | | | Prevent extra `sync_with_transaction_state`Ryuta Kamizono2017-06-151-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `sync_with_transaction_state` in `to_key` is unneeded because `id` also does.
* | | | | | Merge pull request #29451 from vipulnsward/29441-flatten-defaultRafael França2017-06-142-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Allow translate default option to accept an array similar to i18n.t
| * | | | | Allow translate default option to accept an array similar to i18n.t. Fixes ↵Vipul A M2017-06-152-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | #29441
* | | | | | Merge pull request #29378 from kamipo/avoid_overwriting_id_attribute_methodsRafael França2017-06-144-19/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | Avoid overwriting the methods of `AttributeMethods::PrimaryKey`
| * | | | | | Avoid overwriting the methods of `AttributeMethods::PrimaryKey`Ryuta Kamizono2017-06-074-19/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the methods of `AttributeMethods::PrimaryKey` are overwritten by `define_attribute_methods`. It will be broken if a table that customized primary key has non primary key id column. It should not be overwritten if a table has any primary key. Fixes #29350.
* | | | | | | Merge pull request #29417 from ↵Matthew Draper2017-06-1521-26/+26
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | bogdanvlviv/use-require_relative-instead-of_require-with-full-path Use `require_relative` instead of `require` with full path
| * | | | | | Use `require_relative` instead of `require` with full pathbogdanvlviv2017-06-1421-26/+26
|/ / / / / /
* | | | | | Merge pull request #29438 from koic/add_migration_compatibility_testRafael França2017-06-131-0/+15
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Add test for backward compatibility when using change_table
| * | | | | Add test for backward compatibility when using change_tableKoichi ITO2017-06-131-0/+15
|/ / / / /
* | | | | Merge pull request #29435 from y-yagi/fix_formatting_of_action_dispatchRyuta Kamizono2017-06-131-7/+7
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix formatting of AD::FileHandler and AD::Static doc [ci skip]
| * | | | Fix formatting of AD::FileHandler and AD::Static doc [ci skip]yuuji.yaginuma2017-06-131-7/+7
|/ / / /
* | | | Merge pull request #29289 from vergenzt/patch-1Vipul A M2017-06-121-0/+3
|\ \ \ \ | | | | | | | | | | Add note to Railtie docs to use unique filenames
| * | | | Add note to Railtie docs to use unique filenamesTim Vergenz2017-06-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fact that the names need to be globally unique was not obvious to me, so I thought it'd be worth documenting. This not being clear was the cause of both ctran/annotate_models#468 and instructure/outrigger#1. [ci skip]
* | | | | Merge pull request #29425 from gsamokovarov/drop-the-irb-termGuillermo Iguaran2017-06-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Drop IRB out of the web-console Gemfile comment
| * | | | | Drop IRB out of the web-console Gemfile commentGenadi Samokovarov2017-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't provide exactly the same experience as IRB does, so let's not advertize it like that. We can say that it's an interactive console, without further references. I have also followed byebug's comment and changed the calling `console` part. Hopefully, this can hint that the invocation is not view specific and you can use it like the debugger statement. [ci skip]
* | | | | | Add brakeman to guides/additional resources. Fixes #29383 [ci skip] (#29427)Vipul A M2017-06-121-3/+4
| | | | | |
* | | | | | Merge pull request #29422 from y-yagi/fix_default_message_encrypto_cipherRyuta Kamizono2017-06-121-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix `Message::Encryptor` default cipher [ci skip]
| * | | | | | Fix `Message::Encryptor` default cipher [ci skip]yuuji.yaginuma2017-06-121-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Follow up of #29263
* | | | | | [ci skip] Add changelog entry for 6d402c6Kasper Timm Hansen2017-06-111-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | [ Assain Jaleel & Kasper Timm Hansen ]
* | | | | | Merge pull request #29263 from assain/default_message_encryptor_to_gcmKasper Timm Hansen2017-06-115-5/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | Default Message Encryptor Cipher to AES-256-GCM From AES-256-CBC
| * | | | | | set message_encryptor default cipher to aes-256-gcmAssain2017-06-125-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Introduce a method to select default cipher, and maintain backward compatibility
* | | | | | | Merge pull request #29412 from y-yagi/fix_29014Kasper Timm Hansen2017-06-114-18/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Generate field ids in `collection_check_boxes` and `collection_radio_buttons`
| * | | | | | | Generate field ids in `collection_check_boxes` and `collection_radio_buttons`yuuji.yaginuma2017-06-114-18/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure that the labels are linked up with the fields. Fixes #29014
* | | | | | | | Missing dots [ci skip] (#29414)Vipul A M2017-06-111-4/+4
| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-14 01:22:49 +0000