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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #26628 from mjhoy/fix-number-to-human-25742	Eileen M. Uchitelle	2017-05-29	5	-30/+79
\|\
\| *	number_to_human_converter: round before calculating exponent	Michael Hoy	2017-03-16	2	-4/+8
\| *	number_to_rounded_converter: extract rounding logic	Michael Hoy	2017-03-16	3	-26/+71
* \|	Doh. We are doing this on secrets:setup. Revert "Ignore the encrypted secrets...	David Heinemeier Hansson	2017-05-29	1	-3/+0
* \|	Merge pull request #29266 from ojiry/add-elm-option-to-generator-desc	Eileen M. Uchitelle	2017-05-29	1	-1/+1
\|\ \
\| * \|	Add elm option of webpack to generator description	Ryoji Yoshioka	2017-05-29	1	-1/+1
* \| \|	Merge pull request #29264 from gsamokovarov/assert-changes-listing	Matthew Draper	2017-05-29	1	-0/+2
\|\ \ \
\| * \| \|	List assert_{,no_}changes in the testing guide	Genadi Samokovarov	2017-05-29	1	-0/+2
\| \|/ /
* \| \|	Merge pull request #29265 from koic/remove_redundant_test_assertion	Matthew Draper	2017-05-29	1	-6/+0
\|\ \ \
\| * \| \|	Remove a redundant test assertion	Koichi ITO	2017-05-29	1	-6/+0
\| \|/ /
* / /	Ignore the encrypted secrets key file that is created by rails secrets:setup	David Heinemeier Hansson	2017-05-29	1	-0/+3
\|/ /
* \|	Merge pull request #29208 from kamipo/default_env_fall_back_to_default_env_wh...	Guillermo Iguaran	2017-05-28	3	-2/+13
\|\ \
\| * \|	`DEFAULT_ENV` falls back to `default_env` when `RAILS_ENV` or `RACK_ENV` is a...	Ryuta Kamizono	2017-05-25	3	-2/+13
* \| \|	Merge pull request #29262 from kamipo/deprecate_passing_arguments_with_block_...	Guillermo Iguaran	2017-05-28	3	-2/+36
\|\ \ \
\| * \| \|	Deprecate passing arguments and block at the same time to `count` and `sum` i...	Ryuta Kamizono	2017-05-29	3	-2/+36
\|/ / /
* \| \|	Merge pull request #29258 from koic/remove_redundant_command_recorder_test	Matthew Draper	2017-05-29	1	-5/+0
\|\ \ \
\| * \| \|	Remove a redundant test case of command_recorder_test	Koichi ITO	2017-05-29	1	-5/+0
* \| \| \|	Merge pull request #29257 from clupprich/remove-action-dispatch-callbacks-to-...	Kasper Timm Hansen	2017-05-28	1	-3/+1
\|\ \ \ \
\| * \| \| \|	Remove mentions of deprecated callbacks on ActionDispatch::Callbacks	Christoph Lupprich	2017-05-28	1	-3/+1
* \| \| \| \|	Merge pull request #29146 from y-yagi/fix_29138	Kasper Timm Hansen	2017-05-28	2	-2/+15
\|\ \ \ \ \
\| * \| \| \| \|	Correctly set user_supplied_options when there is no whitespace in option spe...	yuuji.yaginuma	2017-05-24	2	-2/+15
* \| \| \| \| \|	Merge pull request #29108 from inopinatus/ujs-sgjs-ie9-support	Kasper Timm Hansen	2017-05-28	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix server-generated JS response processing on IE9 when using rails-ujs and r...	Josh Goodall	2017-05-17	1	-1/+1
* \| \| \| \| \| \|	Merge pull request #29074 from kamipo/remove_returning_true_in_internal_callb...	Kasper Timm Hansen	2017-05-28	3	-13/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Remove returning true in internal callbacks	Ryuta Kamizono	2017-05-14	3	-13/+1
* \| \| \| \| \| \| \|	Merge pull request #28132 from mikeycgto/aead-encrypted-cookies	Kasper Timm Hansen	2017-05-28	10	-108/+295
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	AEAD encrypted cookies and sessions	Michael Coyne	2017-05-22	10	-108/+295
* \| \| \| \| \| \| \| \|	Merge pull request #29253 from kamipo/prevent_extra_query	Matthew Draper	2017-05-29	2	-6/+12
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Prevent extra `current_database` query for `encoding`/`collation`/`ctype`	Ryuta Kamizono	2017-05-28	2	-6/+12
* \| \| \| \| \| \| \| \|	Merge pull request #28969 from kamipo/refactor_enum_to_use_value_instead_of_l...	Matthew Draper	2017-05-28	4	-14/+16
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Refactor enum to use `value` instead of `label` in the scope	Ryuta Kamizono	2017-05-07	4	-14/+16
* \| \| \| \| \| \| \| \| \|	Merge pull request #29003 from kamipo/delegate_ast_and_locked_to_arel_explicitly	Matthew Draper	2017-05-28	4	-1/+13
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Delegate `ast` and `locked` to `arel` explicitly	Ryuta Kamizono	2017-05-06	4	-1/+13
* \| \| \| \| \| \| \| \| \|	Merge pull request #29097 from EilisHamilton/fix_uncountable_pluralization_lo...	Matthew Draper	2017-05-28	3	-6/+20
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Fix pluralization of uncountables when given a locale	Eilis Hamilton	2017-05-19	3	-6/+20
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #29197 from kamipo/enable_extending_even_if_scope_returns_nil	Matthew Draper	2017-05-28	2	-7/+7
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Enable extending even if scope returns nil	Ryuta Kamizono	2017-05-24	2	-7/+7
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #29250 from kamipo/remove_unused_association_interpolate	Matthew Draper	2017-05-28	1	-8/+0
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Remove unused `Association#interpolate`	Ryuta Kamizono	2017-05-28	1	-8/+0
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #29255 from y-yagi/bring_back_delayed_job_to_integration_test	Kasper Timm Hansen	2017-05-28	2	-6/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Bring back delayed_job to test list	yuuji.yaginuma	2017-05-28	1	-2/+1
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Bump `delayed_job_active_record` gem	yuuji.yaginuma	2017-05-28	1	-4/+4
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Clear all current instances before a reload.	Kasper Timm Hansen	2017-05-28	2	-2/+8
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Make reset execution assertions easier to read.	Kasper Timm Hansen	2017-05-28	1	-15/+11
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove double Thread.current storage.	Kasper Timm Hansen	2017-05-28	1	-5/+3
\|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #28895 from codeforkjeff/fix-session-keys-and-values-methods	Matthew Draper	2017-05-28	2	-0/+20
\|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Add lazy loading to #keys and #values methods in Session	codeforkjeff	2017-04-26	2	-0/+20
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #29249 from bradleypriest/numericality-precision-regression	Matthew Draper	2017-05-28	3	-1/+22
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix regression in Numericality validator where extra decimal places on	Bradley Priest	2017-05-27	3	-1/+22
\| \| \|/ / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #29251 from y-yagi/fix_29247	Matthew Draper	2017-05-28	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|