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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Reset time zone to previous value	yuuji.yaginuma	2017-05-30	1	-1/+8
\| \| \| \| \| \| \| \| \| \| \|	Since `CurrentAttributesTest` changed the global time zone, it is necessary to restore the original value after changing the test. The reproduction step: ``` ./bin/test -w --seed 5549 test/current_attributes_test.rb test/core_ext/date_ext_test.rb ```
*	Merge branch 'master' into unlock-minitest	Kasper Timm Hansen	2017-05-29	421	-2199/+3517
\|\
\| *	Merge pull request #29248 from yawboakye/rename-should-rename-table-pkey	Guillermo Iguaran	2017-05-29	2	-4/+28
\| \|\ \| \| \| \| \| \|	`rename_table` should rename primary key index name
\| \| *	`rename_table` renames primary key index name	Yaw Boakye	2017-05-29	2	-4/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Formerly, `rename_table` only renamed primary key index name if the column's data type was sequential (serial, etc in PostgreSQL). The problem with that is tables whose primary keys had other data types (e.g. UUID) maintained the old primary key name. So for example, if the `cats` table has a UUID primary key, and the table is renamed to `felines`, the primary key index will still be called `cats_pkey` instead of `felines_pkey`. This PR corrects it.
\| * \|	Add option for class_attribute default (#29270)	David Heinemeier Hansson	2017-05-29	47	-161/+111
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Allow a default value to be declared for class_attribute * Convert to using class_attribute default rather than explicit setter * Removed instance_accessor option by mistake * False is a valid default value * Documentation
\| * \|	Merge pull request #26628 from mjhoy/fix-number-to-human-25742	Eileen M. Uchitelle	2017-05-29	5	-30/+79
\| \|\ \ \| \| \| \| \| \| \| \|	round before calculating exponent in number_to_human_converter
\| \| * \|	number_to_human_converter: round before calculating exponent	Michael Hoy	2017-03-16	2	-4/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes #25664
\| \| * \|	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 ↵	David Heinemeier Hansson	2017-05-29	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	secrets key file that is created by rails secrets:setup" This reverts commit 75500476eb7e953a06cc64e67ecc57b13ef8cc99.
\| * \| \|	Merge pull request #29266 from ojiry/add-elm-option-to-generator-desc	Eileen M. Uchitelle	2017-05-29	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	[ci skip] Add elm option of webpack to generator description
\| \| * \| \|	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
\| \| * \| \|	List assert_{,no_}changes in the testing guide	Genadi Samokovarov	2017-05-29	1	-0/+2
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This lists the `assert_changes` and `assert_no_changes` methods in the guides. [ci skip]
\| * \| \|	Merge pull request #29265 from koic/remove_redundant_test_assertion	Matthew Draper	2017-05-29	1	-6/+0
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Remove a redundant test assertion
\| \| * \| \|	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 ↵	Guillermo Iguaran	2017-05-28	3	-2/+13
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kamipo/default_env_fall_back_to_default_env_when_rails_env_or_rack_env_is_empty_string `DEFAULT_ENV` falls back to `default_env` when `RAILS_ENV` or `RACK_ENV` is an empty string
\| \| * \|	`DEFAULT_ENV` falls back to `default_env` when `RAILS_ENV` or `RACK_ENV` is ↵	Ryuta Kamizono	2017-05-25	3	-2/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	an empty string Follow up of #27399.
\| * \| \|	Merge pull request #29262 from ↵	Guillermo Iguaran	2017-05-28	3	-2/+36
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kamipo/deprecate_passing_arguments_with_block_to_count_and_sum Deprecate passing arguments and block at the same time to `count` and `sum` in `ActiveRecord::Calculations`
\| \| * \| \|	Deprecate passing arguments and block at the same time to `count` and `sum` ↵	Ryuta Kamizono	2017-05-29	3	-2/+36
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in `ActiveRecord::Calculations` `select`, `count`, and `sum` in `Relation` are also `Enumerable` method that can be passed block. `select` with block already doesn't take arguments since 4fc3366. This is follow up of that.
\| * \| \|	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
\| \| * \| \|	Remove a redundant test case of command_recorder_test	Koichi ITO	2017-05-29	1	-5/+0
\| \| \| \| \|
\| * \| \| \|	Merge pull request #29257 from ↵	Kasper Timm Hansen	2017-05-28	1	-3/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	clupprich/remove-action-dispatch-callbacks-to-prepare-mention Remove mentions of deprecated callbacks on ActionDispatch::Callbacks
\| \| * \| \| \|	Remove mentions of deprecated callbacks on ActionDispatch::Callbacks	Christoph Lupprich	2017-05-28	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActionDispatch::Callbacks.to_prepare was removed in #27587 [ci skip]
\| * \| \| \| \|	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 specification
\| \| * \| \| \| \|	Correctly set user_supplied_options when there is no whitespace in option ↵	yuuji.yaginuma	2017-05-24	2	-2/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	specification Current `user_supplied_options` method can not set the value correctly if there is no space between option and value (e.g., `-p9000`). This makes it possible to set the value correctly in the case like the above. Fixes #29138
\| * \| \| \| \| \|	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
\| \| * \| \| \| \| \|	Fix server-generated JS response processing on IE9 when using rails-ujs and ↵	Josh Goodall	2017-05-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remote: true
\| * \| \| \| \| \| \|	Merge pull request #29074 from ↵	Kasper Timm Hansen	2017-05-28	3	-13/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kamipo/remove_returning_true_in_internal_callbacks Remove returning true in internal callbacks
\| \| * \| \| \| \| \| \|	Remove returning true in internal callbacks	Ryuta Kamizono	2017-05-14	3	-13/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`display_deprecation_warning_for_false_terminator` was removed since 3a25cdc.
\| * \| \| \| \| \| \| \|	Merge pull request #28132 from mikeycgto/aead-encrypted-cookies	Kasper Timm Hansen	2017-05-28	10	-108/+295
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	AEAD encrypted cookies and sessions
\| \| * \| \| \| \| \| \| \|	AEAD encrypted cookies and sessions	Michael Coyne	2017-05-22	10	-108/+295
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit changes encrypted cookies from AES in CBC HMAC mode to Authenticated Encryption using AES-GCM. It also provides a cookie jar to transparently upgrade encrypted cookies to this new scheme. Some other notable changes include: - There is a new application configuration value: +use_authenticated_cookie_encryption+. When enabled, AEAD encrypted cookies will be used. - +cookies.signed+ does not raise a +TypeError+ now if the name of an encrypted cookie is used. Encrypted cookies using the same key as signed cookies would be verified and serialization would then fail due the message still be encrypted.
\| * \| \| \| \| \| \| \| \|	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`
\| \| * \| \| \| \| \| \| \|	Prevent extra `current_database` query for `encoding`/`collation`/`ctype`	Ryuta Kamizono	2017-05-28	2	-6/+12
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #28969 from ↵	Matthew Draper	2017-05-28	4	-14/+16
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kamipo/refactor_enum_to_use_value_instead_of_label Refactor enum to use `value` instead of `label` in the scope
\| \| * \| \| \| \| \| \| \| \|	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
\| \| * \| \| \| \| \| \| \| \|	Delegate `ast` and `locked` to `arel` explicitly	Ryuta Kamizono	2017-05-06	4	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently `ast` and `locked` are used in the internal but delegating to `arel` is depend on `method_missing`. If a model class is defined these methods, `select_all` will be broken. It should be delegated to `arel` explicitly.
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #29097 from ↵	Matthew Draper	2017-05-28	3	-6/+20
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	EilisHamilton/fix_uncountable_pluralization_locale Fix pluralization of uncountables when given a locale
\| \| * \| \| \| \| \| \| \| \| \|	Fix pluralization of uncountables when given a locale	Eilis Hamilton	2017-05-19	3	-6/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously apply_inflections would only use the :en uncountables rather then the ones for the locale that was passed to pluralize or singularize. This changes apply_inflections to take a locale which it will use to find the uncountables.
\| * \| \| \| \| \| \| \| \| \| \|	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
\| \| * \| \| \| \| \| \| \| \| \| \|	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`
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Remove unused `Association#interpolate`	Ryuta Kamizono	2017-05-28	1	-8/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using `Association#interpolate` was removed since #11251.
\| * \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Bring back delayed_job to test list	yuuji.yaginuma	2017-05-28	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`delayed_job_active_record` 4.1.2 supports Rails 5.1. Ref: https://github.com/collectiveidea/delayed_job_active_record/pull/138
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If users added an attribute or otherwise changed a CurrentAttributes subclass they'd see exceptions on the next page load. Because `ActiveSupport::CurrentAttributes.current_instances` would keep references to the old instances from the previous request. We can fix this by clearing out the `current_attributes` before we unload constants. Then any change to the model can be autoloaded again since its slot isn't taken by an old instance. We'll still have to call reset before we clear so external collaborators, like Time.zone, won't linger with their current value throughout other code.
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Make reset execution assertions easier to read.	Kasper Timm Hansen	2017-05-28	1	-15/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The app is booted by then, so there's no need to stash the code away in some other script.
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove double Thread.current storage.	Kasper Timm Hansen	2017-05-28	1	-5/+3
\| \|/ / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since we're generating a key through the class name we can combine the two Thread.current calls into a single hash version.