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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \| \| \|	Merge pull request #26017 from ↵	Kasper Timm Hansen	2016-08-02	2	-0/+51
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kaspth/parameters-yaml-format-backwardscompatibility Make Parameters support legacy YAML encodings.
\| * \| \| \| \| \| \| \| \|	Make Parameters support legacy YAML encodings.	Kasper Timm Hansen	2016-08-01	2	-0/+51
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By changing ActionController::Parameter's superclass, Rails 5 also changed the YAML serialization format. Since YAML doesn't know how to handle parameters it would fallback to its routine for the superclass, which in Rails 4.2 was Hash while just Object in Rails 5. As evident in the tags YAML would spit out: 4.2: !ruby/hash-with-ivars:ActionController::Parameters 5.0: !ruby/object:ActionController::Parameters Thus when loading parameters YAML from 4.2 in Rails 5, it would parse a hash dump as it would an Object class. To fix this we have to provide our own `init_with` to be aware of the past format as well as the new one. Then we add a `load_tags` mapping, such that when the YAML parser sees `!ruby/hash-with-ivars:ActionController::Parameters`, it knows to call our `init_with` function and not try to instantiate it as a normal hash subclass.
* \| \| \| \| \| \| \| \|	Merge pull request #25986 from ↵	Sean Griffin	2016-08-01	1	-29/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kamipo/remove_unnecessary_methods_for_null_relation Remove unnecessary methods for `NullRelation`
\| * \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \|	remove unnecessary require and extend	yuuji.yaginuma	2016-07-31	1	-8/+0
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`rack/test` is require at the top of file. https://github.com/rails/rails/blob/master/railties/test/railties/engine_test.rb#L3 In addtion, `Rack::Test::Methods` is include in class, extend is unnecessary. https://github.com/rails/rails/blob/master/railties/test/railties/engine_test.rb#L9
* \| \| \| \| \| \| \| \|	Merge pull request #26001 from yui-knk/warning	Kasper Timm Hansen	2016-08-01	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Suppress warnings
\| * \| \| \| \| \| \| \| \|	Suppress warnings	yui-knk	2016-07-31	1	-0/+1
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit suppressed `warning: instance variable @session_store not initialized`. e5a6f7ee9e951dbe0e4e9ea2c0743b4dfb135c57 introduced these warnings.
* \| \| \| \| \| \| \| \|	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]
\| * \| \| \| \| \| \| \|	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"
\| * \| \| \| \| \| \|	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
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reset rack.input when the environment is scrubbed for the next request
\| * \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before this change, posted parameters would leak across requests. The included test case failed like so: 1) Failure: TestCaseTest#test_multiple_mixed_method_process_should_scrub_rack_input: --- expected +++ actual @@ -1 +1 @@ -{"bar"=>"an bar", "controller"=>"test_case_test/test", "action"=>"test_params"} +{"foo"=>"an foo", "bar"=>"an bar", "controller"=>"test_case_test/test", "action"=>"test_params"} An argument could be made that this situation isn't encountered often and that one should limit the number of requests per test case, but I still think the parameter leaking is an unexpected side-effect.
* \| \| \| \| \| \| \|	Merge pull request #25941 from kamipo/finder_methods_uses_load_target	Rafael França	2016-07-28	3	-5/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`FinderMethods` uses `records` (`load_target`) when `loaded?` is true
\| * \| \| \| \| \| \| \|	`FinderMethods` uses `records` (`load_target`) when `loaded?` is true	Ryuta Kamizono	2016-07-28	3	-5/+7
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #25940 from kamipo/fix_collection_proxy_load	Rafael França	2016-07-28	2	-0/+14
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix to `CollectionProxy#load` does `load_target`
\| * \| \| \| \| \| \| \| \|	Fix to `CollectionProxy#load` does `load_target`	Ryuta Kamizono	2016-07-25	2	-0/+14
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #25937 from kamipo/remove_prepare_binds_for_database	Rafael França	2016-07-28	4	-8/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove `prepare_binds_for_database` internal method
\| * \| \| \| \| \| \| \| \|	Remove `prepare_binds_for_database` internal method	Ryuta Kamizono	2016-07-28	4	-8/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To avoid relying on the connection adapter for type casting binds.
* \| \| \| \| \| \| \| \| \|	Merge pull request #25340 from kamipo/prevent_table_comment_query	Rafael França	2016-07-28	3	-7/+17
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent `table_comment` query if a table doesn't have a comment
\| * \| \| \| \| \| \| \| \| \|	Prevent `table_comment` query if a table doesn't have a comment	Ryuta Kamizono	2016-06-10	3	-7/+17
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #25974 from ↵	Rafael França	2016-07-28	1	-2/+4
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kamipo/avoid_calling_current_database_in_table_comment Avoid calling `current_database` in `table_comment`
\| * \| \| \| \| \| \| \| \| \| \|	Avoid calling `current_database` in `table_comment`	Ryuta Kamizono	2016-07-28	1	-2/+4
\| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`current_database` executes a query and `table_comment` is called to all tables even if a table does not have a comment. Using `current_database` increases extra queries.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #25973 from ↵	Matthew Draper	2016-07-28	3	-5/+5
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kamipo/should_freeze_quoted_column_table_names_cache `@quoted_{column,table}_names` should cache a frozen string
\| * \| \| \| \| \| \| \| \| \|	`@quoted_{column,table}_names` should cache a frozen string	Ryuta Kamizono	2016-07-28	3	-5/+5
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Caching a mutable string causes the following issue. ``` Loading development environment (Rails 5.1.0.alpha) irb(main):001:0> ActiveRecord::Base.connection.quote_table_name('foo') << '!!' => "`foo`!!" irb(main):002:0> ActiveRecord::Base.connection.quote_table_name('foo') << '!!' => "`foo`!!!!" irb(main):003:0> ActiveRecord::Base.connection.quote_table_name('foo') << '!!' => "`foo`!!!!!!" ```
* \| \| \| \| \| \| \| \| \|	Merge pull request #25948 from chetna1726/docs	Rafael França	2016-07-28	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Add documentation for error using select with order
\| * \| \| \| \| \| \| \| \| \|	[ci skip] Add documentation for error using select with order	Chetna Sharma	2016-07-25	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #25961 from Azzurrio/master	Rafael França	2016-07-28	4	-1/+18
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix accessing provider_job_id inside active jobs for sidekiq adapter
\| * \| \| \| \| \| \| \| \| \| \|	Fix accessing provider_job_id inside active jobs for sidekiq adapter	Azzurrio	2016-07-28	4	-1/+18
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #25952 from harfangk/master	प्रथमेश Sonpatki	2016-07-28	1	-19/+14
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated getting_started.md guide source text to reflect the change in error message …
\| * \| \| \| \| \| \| \| \| \| \| \|	Updated getting_started guide to reflect the change in error message for ↵	Bonghyun Kim	2016-07-28	1	-19/+14
\| \| \|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActionController::UnknownFromat in ArticlesController#new Restored texts about XML and JS template handlers. [ci skip]
* \| \| \| \| \| \| \| \| \| \| \|	Do not require rb-inotify	Rafael Mendonça França	2016-07-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Use a form of rb-inotify to fix broken tests with Ruby 2.2.5	Rafael Mendonça França	2016-07-27	2	-2/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://github.com/nex3/rb-inotify/pull/49
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #25767 from ↵	Rafael França	2016-07-27	4	-3/+20
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kamipo/association_name_is_the_same_as_join_table_name Correctly return `associated_table` when `associated_with?` is true
\| * \| \| \| \| \| \| \| \| \| \| \|	Correctly return `associated_table` when `associated_with?` is true	Ryuta Kamizono	2016-07-10	4	-3/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`AssociationQueryHandler` requires `association` initialized `TableMetadata` even if `table_name == arel_table.name`. Fixes #25689.
* \| \| \| \| \| \| \| \| \| \| \| \|	Add the TABLE_SCHEMA condition to the SELECT statement in table_comment (#25945)	Takeshi AKIMA	2016-07-27	2	-1/+6
\| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Rafael Mendonça França + Takeshi AKIMA]
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #25702 from k0kubun/joins-circular-reference	Sean Griffin	2016-07-27	2	-1/+10
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove circular join references in join_dependency
\| * \| \| \| \| \| \| \| \| \| \| \|	Remove circular join references in join_dependency	Takashi Kokubun	2016-07-28	2	-1/+10
\| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #25653.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #25963 from bdewater/auth_tag_doc	Rafael França	2016-07-27	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add rationale for checking auth_tag length for AEAD ciphers
\| * \| \| \| \| \| \| \| \| \| \| \|	Add rationale for manually checking auth_tag length, which got lost when ↵	Bart de Water	2016-07-27	1	-0/+4
\| \|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#25874 was squashed before merging [skip ci]
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #25913 from chrisarcand/fix-keyed-defaults-with-root	Rafael Mendonça França	2016-07-27	3	-1/+33
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix keyed defaults with root
\| * \| \| \| \| \| \| \| \| \| \| \|	Update changelog	Chris Arcand	2016-07-26	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix 'defaults' option for root route	Chris Arcand	2016-07-21	2	-1/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The merging of the 'defaults' option was moved up the stack in e852daa This allows us to see where these options originate from the standard HttpHelpers (get, post, patch, put, delete) Unfortunately this move didn't incorporate the 'root' method, which has always allowed the same 'defaults' option before.
* \| \| \| \| \| \| \| \| \| \| \| \|	Generators and tests are under the same style rules	Rafael Mendonça França	2016-07-27	1	-14/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Bump arel	Rafael Mendonça França	2016-07-27	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #25938 from ↵	Rafael França	2016-07-27	2	-10/+10
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kamipo/decouple_statement_cache_from_connection_adapter Decouple statement cache from connection adapter
\| * \| \| \| \| \| \| \| \| \| \| \|	Decouple statement cache from connection adapter	Ryuta Kamizono	2016-07-24	2	-10/+10
\| \| \|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`StatementCache` is hard-coded in `cacheable_query` and be passed `visitor` and `collector` from connection adapter. Simply it is enough to pass a collected value.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #25958 from kamipo/should_be_target_loaded	Yves Senn	2016-07-27	1	-0/+38
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add an assertion to the tests that should be loaded the target.