rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Fix formatting of AD::FileHandler and AD::Static doc [ci skip]	yuuji.yaginuma	2017-06-13	1	-7/+7
\|/ / /
* \| \|	Merge pull request #29289 from vergenzt/patch-1	Vipul A M	2017-06-12	1	-0/+3
\|\ \ \
\| * \| \|	Add note to Railtie docs to use unique filenames	Tim Vergenz	2017-06-12	1	-0/+3
* \| \| \|	Merge pull request #29425 from gsamokovarov/drop-the-irb-term	Guillermo Iguaran	2017-06-12	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Drop IRB out of the web-console Gemfile comment	Genadi Samokovarov	2017-06-12	1	-1/+1
* \| \| \| \|	Add brakeman to guides/additional resources. Fixes #29383 [ci skip] (#29427)	Vipul A M	2017-06-12	1	-3/+4
* \| \| \| \|	Merge pull request #29422 from y-yagi/fix_default_message_encrypto_cipher	Ryuta Kamizono	2017-06-12	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Fix `Message::Encryptor` default cipher [ci skip]	yuuji.yaginuma	2017-06-12	1	-1/+1
\|/ / / / /
* \| \| \| \|	[ci skip] Add changelog entry for 6d402c6	Kasper Timm Hansen	2017-06-11	1	-0/+7
* \| \| \| \|	Merge pull request #29263 from assain/default_message_encryptor_to_gcm	Kasper Timm Hansen	2017-06-11	5	-5/+30
\|\ \ \ \ \
\| * \| \| \| \|	set message_encryptor default cipher to aes-256-gcm	Assain	2017-06-12	5	-5/+30
* \| \| \| \| \|	Merge pull request #29412 from y-yagi/fix_29014	Kasper Timm Hansen	2017-06-11	4	-18/+28
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Generate field ids in `collection_check_boxes` and `collection_radio_buttons`	yuuji.yaginuma	2017-06-11	4	-18/+28
* \| \| \| \| \| \|	Missing dots [ci skip] (#29414)	Vipul A M	2017-06-11	1	-4/+4
* \| \| \| \| \| \|	Merge pull request #29268 from gsamokovarov/delegate-missing-to-guides	Vipul A M	2017-06-11	1	-0/+21
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Document Module#delegate_missing_to in the guides	Genadi Samokovarov	2017-06-11	1	-0/+21
* \| \| \| \| \| \|	Access EDITOR through Ruby's cross-platform ENV.	Kasper Timm Hansen	2017-06-11	1	-2/+2
* \| \| \| \| \| \|	Cache: test coverage for cleanup behavior with local cache strategy	Eugene Kenny	2017-06-10	2	-1/+16
\| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
* \| \| \| \| \|	Revert #25628. Incomplete change + needs a deprecation cycle.	Jeremy Daer	2017-06-10	3	-5/+5
* \| \| \| \| \|	Merge pull request #29406 from y-yagi/remove_null_allowed_option	Ryuta Kamizono	2017-06-10	1	-2/+1
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Remove `null_allowed` option from doc [ci skip]	yuuji.yaginuma	2017-06-10	1	-2/+1
\|/ / / / /
* \| \| \| \|	Split up the cache test suite so it's easier to understand and extend (#29404)	Jeremy Daer	2017-06-10	20	-1359/+1383
* \| \| \| \|	Merge pull request #29403 from yasslab/add-backquote-to-counter-cache	Richard Schneeman	2017-06-09	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	[ci skip] Add backquote to :counter_cache option	Yohei Yasukawa	2017-06-10	1	-1/+1
\|/ / / / /
* \| \| \| \|	Make i18n test match the description of the test	Guillermo Iguaran	2017-06-09	1	-1/+1