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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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.
* \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \| \|	Add lazy loading to #keys and #values methods in Session	codeforkjeff	2017-04-26	2	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes a bug where session.keys and session.values return an empty array unless one of the other methods that does lazy loading from the underlying store is called first. #keys and #values should also call #load_for_read!
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #29249 from bradleypriest/numericality-precision-regression	Matthew Draper	2017-05-28	3	-1/+22
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix regression in Numericality validator
\| * \| \| \| \| \| \| \| \| \| \|	Fix regression in Numericality validator where extra decimal places on	Bradley Priest	2017-05-27	3	-1/+22
\| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	a user input for a decimal column were ignored by numerically validations
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #29251 from y-yagi/fix_29247	Matthew Draper	2017-05-28	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Includes namespace in system test skelton when namespace is specified
\| * \| \| \| \| \| \| \| \| \|	Includes namespace in system test skelton when namespace is specified	yuuji.yaginuma	2017-05-28	2	-1/+6
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #29247
* \| \| \| \| \| \| \| \| \|	Use non-raising finder.	Kasper Timm Hansen	2017-05-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`find` raises when it can't find a record, so we'll never reach the else. Switch to `find_by` which returns nil when no record can be found.
* \| \| \| \| \| \| \| \| \|	[ci skip] Fix spelling that's a bit of an overreach.	Kasper Timm Hansen	2017-05-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Use models to match the docs.	Kasper Timm Hansen	2017-05-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #29246 from nihemak/fix-docs-take-first	Matthew Draper	2017-05-27	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]fix wrong variable name in docs
\| * \| \| \| \| \| \| \| \| \|	[ci skip]fix wrong variable name in docs	Makoto Nihei	2017-05-27	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #29245 from nihemak/fix-docs-find	Richard Schneeman	2017-05-26	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	[ci skip]fix wrong variable name in docs
\| * \| \| \| \| \| \| \| \| \|	[ci skip]fix wrong variable name in docs	Makoto Nihei	2017-05-27	1	-1/+1
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Switch to rb-inotify master	Matthew Draper	2017-05-27	2	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/guard/rb-inotify/pull/49 has been merged.
* \| \| \| \| \| \| \| \| \|	Merge pull request #29240 from tjschuck/ar_batches_doc_updates	Rafael França	2017-05-26	1	-12/+12
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doc updates for ActiveRecord::Batches
\| * \| \| \| \| \| \| \| \| \|	Doc updates for ActiveRecord::Batches	T.J. Schuck	2017-05-26	1	-12/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #29242 from tjschuck/rdoc_formatting_fix	Rafael França	2017-05-26	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken RDoc formatting
\| * \| \| \| \| \| \| \| \| \| \|	Fix broken RDoc formatting	T.J. Schuck	2017-05-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #29152 from djforth/master	Rafael Mendonça França	2017-05-26	1	-0/+10
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update to Rails ujs readme
\| * \| \| \| \| \| \| \| \| \| \|	Update to rails-ujs documentation for yarn install	Adrian Stainforth	2017-05-26	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #29237 from mohitnatoo/arel-update-doc	Rafael França	2017-05-26	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Changed sentence formation for ActiveRecordRelation#update
\| * \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Changed sentence formation for ActiveRecordRelation#update	Mohit Natoo	2017-05-26	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #25037 from mohitnatoo/adapter-inquirer	Rafael França	2017-05-26	2	-3/+21
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|	Provides friendlier way to access queue adapters of a job.
\| * \| \| \| \| \| \| \| \| \| \| \|	Removed string inquiry.	Mohit Natoo	2017-05-26	2	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed indentation. rebased with master.