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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #25991 from rails/retry-and-discard-jobs	David Heinemeier Hansson	2016-08-02	8	-26/+289
\|\
\| *	Amend the CHANGELOG	David Heinemeier Hansson	2016-08-02	1	-0/+21
\| *	Fix tests against ActiveSupport::Durations	David Heinemeier Hansson	2016-08-02	3	-32/+56
\| *	Merge branch 'master' into retry-and-discard-jobs	David Heinemeier Hansson	2016-08-02	16	-135/+108
\| \|\
\| * \|	Please Rubocup	David Heinemeier Hansson	2016-08-02	2	-5/+5
\| * \|	Not needed	David Heinemeier Hansson	2016-08-01	1	-1/+0
\| * \|	Allow for custom handling of exceptions that persist beyond the retry attempts	David Heinemeier Hansson	2016-08-01	3	-4/+21
\| * \|	Add exponentially_longer and custom wait algorithms	David Heinemeier Hansson	2016-08-01	3	-3/+68
\| * \|	Use descriptive exception names	David Heinemeier Hansson	2016-08-01	2	-20/+20
\| * \|	Executions counting is not a serialization concern	David Heinemeier Hansson	2016-08-01	2	-1/+2
\| * \|	Reraise instead of swallow exceptions that occur beyond the retry attempts	David Heinemeier Hansson	2016-07-29	2	-2/+3
\| * \|	Proper logging when we bail on retrying after X attempts	David Heinemeier Hansson	2016-07-29	1	-2/+6
\| * \|	Allow retries to happen with different priority and queue	David Heinemeier Hansson	2016-07-29	1	-2/+4
\| * \|	Require time extension for 3.seconds default	David Heinemeier Hansson	2016-07-29	1	-0/+2
\| * \|	Mention defaults	David Heinemeier Hansson	2016-07-29	1	-2/+2
\| * \|	Satisfy pedantic rubocop whitespace detection	David Heinemeier Hansson	2016-07-29	2	-6/+6
\| * \|	Remove needless require	David Heinemeier Hansson	2016-07-29	1	-2/+0
\| * \|	Add retry_on/discard_on for better exception handling	David Heinemeier Hansson	2016-07-29	6	-26/+155
* \| \|	Merge pull request #26022 from kamipo/remove_unnecessary_set_inverse_instance	Kasper Timm Hansen	2016-08-02	1	-6/+2
\|\ \ \
\| * \| \|	Remove unnecessary `set_inverse_instance` in finder methods	Ryuta Kamizono	2016-08-02	1	-6/+2
* \| \| \|	Add 4.2.Z back to the maintenance list	Rafael Mendonça França	2016-08-02	1	-1/+1
\| \|_\|/ \|/\| \|
* \| \|	Show supported DBs first in `rails new --help`	Akira Matsuda	2016-08-03	1	-5/+5
* \| \|	Remove extra connection pool creation	Arthur Neves	2016-08-02	1	-1/+0
* \| \|	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2016-08-02	4	-4/+12
\|\ \ \
\| * \| \|	Removed reference to callback_terminator.rb in docs	Iain Beeston	2016-07-21	1	-1/+1
\| * \| \|	Fix documentation of `index` option for the `add_reference` method [ci skip]	Prathamesh Sonpatki	2016-07-16	1	-1/+1
\| * \| \|	The `to_query` method on Array objects uses `key[] as the prefix, not `_key_[...	Prathamesh Sonpatki	2016-07-10	1	-1/+1
\| * \| \|	Add `config.assets.quiet` to configuration guide [ci skip]	Prathamesh Sonpatki	2016-07-10	1	-0/+2
\| * \| \|	Add note about `config.annotations.register_directories` option in the guides...	Prathamesh Sonpatki	2016-07-10	1	-1/+7
* \| \| \|	Fix wrong assignment.	Kasper Timm Hansen	2016-08-02	1	-4/+5
* \| \| \|	Set `always_permitted_parameters`.	Kasper Timm Hansen	2016-08-02	1	-0/+9
* \| \| \|	Move the YAML hook closer to `init_with`.	Kasper Timm Hansen	2016-08-02	1	-8/+9
* \| \| \|	Replace implicit formats with a case statement.	Kasper Timm Hansen	2016-08-02	1	-7/+8
* \| \| \|	Let Psych 2.0.9+ deserialize 2.0.8 serialized parameters.	Kasper Timm Hansen	2016-08-02	2	-4/+24
* \| \| \|	Merge pull request #26017 from kaspth/parameters-yaml-format-backwardscompati...	Kasper Timm Hansen	2016-08-02	2	-0/+51
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	Make Parameters support legacy YAML encodings.	Kasper Timm Hansen	2016-08-01	2	-0/+51
\|/ / /
* \| \|	Merge pull request #25986 from kamipo/remove_unnecessary_methods_for_null_rel...	Sean Griffin	2016-08-01	1	-29/+7
\|\ \ \
\| * \| \|	Remove unnecessary methods for `NullRelation`	Ryuta Kamizono	2016-07-29	1	-29/+7
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #26004 from y-yagi/remove_unnecessary_require_and_extend	Santiago Pastorino	2016-08-01	1	-8/+0
\|\ \ \
\| * \| \|	remove unnecessary require and extend	yuuji.yaginuma	2016-07-31	1	-8/+0
* \| \| \|	Merge pull request #26001 from yui-knk/warning	Kasper Timm Hansen	2016-08-01	1	-0/+1
\|\ \ \ \
\| * \| \| \|	Suppress warnings	yui-knk	2016-07-31	1	-0/+1
\| \|/ / /
* \| \| \|	Merge pull request #26013 from y-yagi/remove_old_links_about_debugger	Kasper Timm Hansen	2016-08-01	1	-7/+0
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	remove old links from debugging guide [ci skip]	yuuji.yaginuma	2016-08-01	1	-7/+0
\|/ / /
* \| \|	Merge pull request #25992 from rails/revert-25914-jm/not_in	David Heinemeier Hansson	2016-07-29	4	-81/+0
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Revert "Adds `not_in?` onto Object"	David Heinemeier Hansson	2016-07-29	4	-81/+0
\|/ /
* \|	Merge pull request #25965 from nicksieger/ac_test_case_reset_rack_input	Guillermo Iguaran	2016-07-28	3	-0/+23
\|\ \
\| * \|	Test that ActionDispatch::IntegrationTest does not leak parameters	Nick Sieger	2016-07-28	1	-0/+14
\| * \|	Reset rack.input when the environment is scrubbed for the next request	Nick Sieger	2016-07-27	2	-0/+9
* \| \|	Merge pull request #25941 from kamipo/finder_methods_uses_load_target	Rafael França	2016-07-28	3	-5/+7
\|\ \ \