aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-06-16462-3743/+5112
|\
| * Merge pull request #29482 from Edouard-chin/test-load-pathRafael França2017-06-161-1/+1
| |\
| | * Add the `<app_root>/test` dir to the `$LOAD_PATH` as a string:Edouard CHIN2017-06-161-1/+1
| |/
| * Merge pull request #29140 from notEthan/log_subscribed_avoid_rescuingRafael França2017-06-161-2/+4
| |\
| | * 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 halogenandtoast/mm-mailer-delayed-job-document...Guillermo Iguaran2017-06-151-0/+16
| |\ \
| | * | 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
| |\ \
| | * | 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_attributeEugene Kenny2017-06-152-15/+12
| * | | | Merge pull request #29462 from kamipo/fix_dump_schema_information_with_empty_...Rafael França2017-06-152-1/+7
| |\ \ \ \
| | * | | | Fix `dump_schema_information` with empty versionsRyuta Kamizono2017-06-152-1/+7
| * | | | | 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 #28274Ryuta Kamizono2017-06-151-0/+46
| * | | | | | Merge pull request #29457 from halogenandtoast/mm-configure_delivery_jobGuillermo Iguaran2017-06-154-1/+26
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Allow mailers to configure their delivery jobMatthew Mongeau2017-06-154-1/+26
| * | | | | | 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
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | 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 adaptersEugene Kenny2017-06-141-1/+2
| * | | | | | Merge pull request #29452 from kamipo/prevent_extra_sync_with_transaction_stateRafael França2017-06-151-5/+2
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Prevent extra `sync_with_transaction_state`Ryuta Kamizono2017-06-151-5/+2
| * | | | | | 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. Fixes #2...Vipul A M2017-06-152-1/+2
| * | | | | | Merge pull request #29378 from kamipo/avoid_overwriting_id_attribute_methodsRafael França2017-06-144-19/+24
| |\ \ \ \ \ \
| | * | | | | | Avoid overwriting the methods of `AttributeMethods::PrimaryKey`Ryuta Kamizono2017-06-074-19/+24
| * | | | | | | Merge pull request #29417 from bogdanvlviv/use-require_relative-instead-of_re...Matthew Draper2017-06-1521-26/+26
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | 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_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]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 filenamesTim Vergenz2017-06-121-0/+3
| * | | | | Merge pull request #29425 from gsamokovarov/drop-the-irb-termGuillermo Iguaran2017-06-121-1/+1
| |\ \ \ \ \
| | * | | | | Drop IRB out of the web-console Gemfile commentGenadi Samokovarov2017-06-121-1/+1
| * | | | | | 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]yuuji.yaginuma2017-06-121-1/+1
| |/ / / / / /
| * | | | | | [ci skip] Add changelog entry for 6d402c6Kasper Timm Hansen2017-06-111-0/+7
| * | | | | | Merge pull request #29263 from assain/default_message_encryptor_to_gcmKasper Timm Hansen2017-06-115-5/+30
| |\ \ \ \ \ \
| | * | | | | | set message_encryptor default cipher to aes-256-gcmAssain2017-06-125-5/+30
| * | | | | | | Merge pull request #29412 from y-yagi/fix_29014Kasper Timm Hansen2017-06-114-18/+28
| |\ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-18 15:43:15 +0000