aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #29488 from utilum/update_gemfileMatthew Draper2017-06-182-12/+2
|\
| * Fixes FIXME: rb-inotify 0.99 has been releasedutilum2017-06-172-13/+4
|/
* Merge pull request #29487 from utilum/update_feodra_package_nameVipul A M2017-06-171-1/+1
|\
| * [ci skip] Update fedora SQLite3 package nameutilum2017-06-171-1/+1
|/
* Merge pull request #29415 from kamipo/remove_unused_defined_associationGuillermo Iguaran2017-06-162-2/+1
|\
| * Remove unused defined associationRyuta Kamizono2017-06-112-2/+1
* | Merge pull request #29455 from kirs/remove-column-with-fk-mysqlGuillermo Iguaran2017-06-162-0/+17
|\ \
| * | Remove FK together with column in MySQLKir Shatrov2017-06-162-0/+17
* | | Merge pull request #29392 from alexcameron89/unpersisted_create_associationMatthew Draper2017-06-173-1/+14
|\ \ \
| * | | Raise on create for singular association when parent is unpersistedAlex Kitchens2017-06-083-1/+14
* | | | Merge pull request #29431 from kamipo/fix_create_table_with_query_from_relationMatthew Draper2017-06-172-7/+10
|\ \ \ \
| * | | | Fix `create_table` with query from relationRyuta Kamizono2017-06-132-7/+10
* | | | | Merge pull request #29461 from dnl/unscope_where_orMatthew Draper2017-06-172-1/+26
|\ \ \ \ \
| * | | | | Don't require 'unscope' to be the same for both sides of a 'or' relation.Dan Sherson2017-06-152-1/+26
* | | | | | Merge pull request #29470 from kamipo/use_nullable_column_instead_of_primary_keyMatthew Draper2017-06-171-1/+2
|\ \ \ \ \ \
| * | | | | | Use nullable `id` column instead of a primary keyRyuta Kamizono2017-06-161-1/+2
* | | | | | | Remove references to deprecared raise_runtime_errors from documentation, whic...Vipul A M2017-06-172-16/+0
* | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |