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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #31236 from y-yagi/use_puma_311_in_new_apps	Guillermo Iguaran	2017-11-27	2	-2/+2
\|\
\| *	Use Puma 3.11 in newly generated applications	yuuji.yaginuma	2017-11-27	2	-2/+2
\|/
*	Merge pull request #31167 from albertoalmagro/clean-db-ambiguity	Rafael França	2017-11-26	1	-2/+2
\|\
\| *	Remove DB naming ambiguity	Alberto Almagro	2017-11-26	1	-2/+2
* \|	Add new error class `QueryCanceled` which will be raised when canceling state...	Ryuta Kamizono	2017-11-27	6	-3/+69
* \|	Rename `TransactionTimeout` to more descriptive `LockWaitTimeout` (#31223)	Ryuta Kamizono	2017-11-27	6	-9/+9
* \|	Merge pull request #31229 from y-yagi/remove_field_ids_from_scaffold_form	Kasper Timm Hansen	2017-11-26	3	-11/+7
\|\ \
\| * \|	Remove field ids from scaffold form	yuuji.yaginuma	2017-11-26	3	-11/+7
* \| \|	Revert "Merge pull request #31006 from rails/kamipo/ordinal_methods_should_re...	eileencodes	2017-11-26	2	-17/+0
\| \|/ \|/\|
* \|	Revert "Remove stopgap_13632 entirely for now: it doesn't support 2.2.8"	Matthew Draper	2017-11-26	1	-0/+3
* \|	Merge pull request #31221 from matthewd/flush-idle-connections	Matthew Draper	2017-11-26	6	-17/+129
\|\ \
\| * \|	Flush idle database connections	Matthew Draper	2017-11-26	6	-17/+129
* \| \|	Merge pull request #31232 from weedySeaDragon/engines-guide-copyediting--neut...	Matthew Draper	2017-11-26	1	-3/+3
\|\ \ \
\| * \| \|	fix comma splice [ci skip]	Ashley Engelund (weedySeaDragon @ github)	2017-11-26	1	-1/+1
\| * \| \|	verb tense correction [ci skip]	Ashley Engelund (weedySeaDragon @ github)	2017-11-26	1	-1/+1
\| * \| \|	gendered wording not necessary; changed to neutral [ci skip]	Ashley Engelund (weedySeaDragon @ github)	2017-11-26	1	-1/+1
\|/ / /
* \| /	Let rubygems handle our objection to mysql2 0.4.3	Matthew Draper	2017-11-26	1	-2/+1
\| \|/ \|/\|
* \|	Remove duplicated `form_with_generates_remote_forms` setting	yuuji.yaginuma	2017-11-26	1	-1/+0
* \|	Merge pull request #31184 from TheSmartnik/fix_record_not_found_on_reload	Rafael França	2017-11-25	4	-7/+35
\|\ \
\| * \|	Provide arguments to RecordNotFound	Nikita Misharin	2017-11-25	4	-7/+35
* \| \|	Merge pull request #31181 from tenshilg/fix-api-guides	Rafael França	2017-11-25	1	-2/+4
\|\ \ \
\| * \| \|	Fix names of http authentication modules in api_app guides	Roman Kovtunenko	2017-11-19	1	-2/+4
* \| \| \|	Renove duplicated and wrong test	Rafael Mendonça França	2017-11-25	1	-5/+0
* \| \| \|	Add test to make sure form_for is not affected by	Rafael Mendonça França	2017-11-25	1	-0/+32
* \| \| \|	Make sure that form_with_generates_ids only affects form_with	Rafael Mendonça França	2017-11-25	5	-3/+9
* \| \| \|	Use parentheses for multi-line method calls	Rafael Mendonça França	2017-11-25	2	-5/+10
* \| \| \|	Merge pull request #29439 from npezza93/set-skip-default-ids	Rafael Mendonça França	2017-11-25	12	-228/+316
\|\ \ \ \
\| * \| \| \|	Make form_with_generates_ids default in Rails 5.2	Rafael Mendonça França	2017-11-25	2	-5/+8
\| * \| \| \|	Change `form_with` to generates ids by default	npezza93	2017-11-25	12	-225/+310
* \| \| \| \|	Merge pull request #30879 from toptal/add_better_logging_to_delayed_job	Rafael França	2017-11-25	2	-0/+11
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Improve DelayedJob wrapper logging	Jacek Lachowski	2017-11-24	2	-0/+11
* \| \| \| \|	Compare the actual string after comparing the HMAC proccessed strings	Rafael Mendonça França	2017-11-25	1	-1/+1
* \| \| \| \|	Merge pull request #24510 from vipulnsward/make-variable_size_secure_compare-...	Rafael Mendonça França	2017-11-25	5	-19/+37
\|\ \ \ \ \
\| * \| \| \| \|	Changed default behaviour of `ActiveSupport::SecurityUtils.secure_compare`,	Vipul A M	2017-06-07	5	-19/+37
* \| \| \| \| \|	Merge pull request #30510 from yhirano55/add_nodoc_to_activerecord	Eileen M. Uchitelle	2017-11-25	3	-7/+7
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add :nodoc: to activerecord [ci skip]	Yoshiyuki Hirano	2017-09-03	3	-7/+7
* \| \| \| \| \| \|	Merge pull request #31006 from rails/kamipo/ordinal_methods_should_respect_lo...	Eileen M. Uchitelle	2017-11-25	2	-0/+17
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Ordinal methods should respect loaded records	Ryuta Kamizono	2017-10-28	2	-0/+17
* \| \| \| \| \| \| \|	Merge pull request #31226 from fgo/patch-22	Eileen M. Uchitelle	2017-11-25	1	-3/+3
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Update guide layout [ci skip]	Francis Go	2017-11-25	1	-3/+3
\|/ / / / / / / /
* \| \| \| \| \| \| \|	[ci skip] SecureRandom should mentioned Win32 CryptoAPI functions ins… (#31...	Atul Shimpi	2017-11-25	1	-1/+1
* \| \| \| \| \| \| \|	Merge pull request #31173 from matthewd/connection-fork-safety	Matthew Draper	2017-11-25	5	-0/+90
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Improve AR connection fork safety	Matthew Draper	2017-11-18	5	-0/+90
* \| \| \| \| \| \| \|	Merge pull request #31215 from dixitp012/fix_rubocop_style_in_railties	Rafael França	2017-11-24	1	-0/+2
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Rubocop style	Dixit Patel	2017-11-24	1	-0/+2
* \| \| \| \| \| \| \| \|	Merge pull request #30881 from dimroc/master	Vipul A M	2017-11-25	1	-36/+24
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Update documentation to lead with ajax param `event.detail`	Dimitri Roche	2017-11-24	1	-4/+9
\| * \| \| \| \| \| \| \| \|	Update documentation to lead with ajax param `event.detail`	Dimitri Roche	2017-10-13	1	-36/+19
* \| \| \| \| \| \| \| \| \|	Merge pull request #31217 from atul-shimpi/master	Vipul A M	2017-11-24	7	-0/+0
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	[ci skip] Rails Associations examples contains ActiveRecord::Base reference i...	Atul Shimpi	2017-11-24	7	-0/+0
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|