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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \| \| \|	Merge pull request #25868 from kamipo/fix_payload_class_name_to_spec_name	Rafael França	2016-07-20	5	-13/+10
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix `payload[:class_name]` to `payload[:spec_name]`
\| * \| \| \| \| \| \| \| \| \|	Fix `payload[:class_name]` to `payload[:spec_name]`	Ryuta Kamizono	2016-07-17	5	-13/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Follow up to #20818. `retrieve_connection` is passed `spec_name` instead of `klass` since #24844.
* \| \| \| \| \| \| \| \| \| \|	Add a new rule to rubocop	Rafael Mendonça França	2016-07-20	1	-10/+13
\| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #25780 from Ropeney/patch-1	Matthew Draper	2016-07-19	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update ActionCable Rebroadcasting a Message documentation
\| * \| \| \| \| \| \| \| \| \|	Update ActionCable Rebroadcasting a Message documentation	Joseph Mullins	2016-07-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace broadcast_to with ActionCable.server.broadcast to be inline with its partner, #stream_from
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #25886 from kamipo/pass_type_casted_binds_to_log_subscriber	Xavier Noria	2016-07-19	6	-25/+29
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \|	Pass `type_casted_binds` to log subscriber for logging bind values properly
\| * \| \| \| \| \| \| \| \| \|	Pass `type_casted_binds` to log subscriber for logging bind values properly	Ryuta Kamizono	2016-07-19	6	-25/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Address to https://github.com/rails/rails/commit/5a302bf553af0e6fedfc63299fc5cd6e79599ef3#commitcomment-18288388.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #25883 from claudiob/fix-gotcha	Claudio B	2016-07-18	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Fix docs in collection_radio_buttons
\| * \| \| \| \| \| \| \| \| \|	Fix docs in collection_radio_buttons	claudiob	2016-07-18	1	-3/+3
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Just some english and `<tt>` tags.
* \| \| \| \| \| \| \| \| \|	Merge pull request #25881 from kamipo/logging_type_casted_binds	Sean Griffin	2016-07-18	1	-1/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Logging type casted binds
\| * \| \| \| \| \| \| \| \| \|	Logging type casted binds	Ryuta Kamizono	2016-07-19	1	-1/+5
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #22398.
* \| \| \| \| \| \| \| \| \|	Merge pull request #25878 from alexcameron89/associations_doc	Jon Moss	2016-07-18	1	-13/+13
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Fix grammar in AR::Associations
\| * \| \| \| \| \| \| \| \| \|	[ci skip] Fix grammar in AR::Associations	Alex Kitchens	2016-07-18	1	-13/+13
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	deprecates the error_on_ignored_order_or_limit instance reader	Xavier Noria	2016-07-18	2	-2/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Albeit the previous existence of this method is not seen in the patch itself, the declaration mattr_accessor :error_on_ignored_order_or_limit, instance_writer: false was present before. It was removed recently in 210012f.
* \| \| \| \| \| \| \| \| \|	adds coverage for the deprecation of error_on_ignored_order	Xavier Noria	2016-07-18	1	-0/+8
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #25866 from prathamesh-sonpatki/rm-deprecated-mattr-accessor	Xavier Noria	2016-07-18	2	-5/+12
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \|	Followup of changes done to `error_on_ignored_order`
\| * \| \| \| \| \| \| \| \|	Fix documentation of `error_on_ignored_order` option	Prathamesh Sonpatki	2016-07-18	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Followup of https://github.com/rails/rails/commit/451437c6f57e66cc7586ec966e530493927098c7
\| * \| \| \| \| \| \| \| \|	Remove mattr_accessor for deprecated config `error_on_ignored_order_or_limit`.	Prathamesh Sonpatki	2016-07-18	1	-1/+8
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- It adds lot of warnings while running the tests. After https://github.com/rails/rails/commit/451437c6f57e66cc7586ec966e530493927098c7 it is not needed. - Added reader method with deprecation warning for backward compatibility.
* \| \| \| \| \| \| \| \|	Merge pull request #25867 from kamipo/no_need_public_send	Matthew Draper	2016-07-17	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	No need `public_send`
\| * \| \| \| \| \| \| \|	No need `public_send`	Ryuta Kamizono	2016-07-17	1	-2/+2
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Store the old logger before calling super	Rafael Mendonça França	2016-07-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	setup in ActiveSupport::LogSubscriber::TestHelper call set_logger that will change ActionController::Base.logger to the MockLogger so that logger will be always MockLogger
* \| \| \| \| \| \| \|	Check if the logger exists before trying to use it	Rafael Mendonça França	2016-07-17	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Make sure the time method is unstubed	Rafael Mendonça França	2016-07-17	1	-29/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The minitest stubs were conflicting with the time travel stubs so the travel_back method call in the teardown block was actually keeping the time stubbed.
* \| \| \| \| \| \| \|	Sort the mime types before comparing	Rafael Mendonça França	2016-07-17	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For those tests that use start we don't need to assert the actual order of mime types that are returned. This happen because this order is more about the order the mime type was registered than the order that it is expected to it resolve. We need to sort because we remove the json mime type in json_params_parsing_test and add it to the end of the mime types set so if that file runs before those tests we will have a failing test. [Rafael Mendonça França + Lucas Hosseini]
* \| \| \| \| \| \| \|	Make sure the tests setup are made correctly	Rafael Mendonça França	2016-07-17	1	-9/+9
\| \|_\|/ / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #20818 from ↵	Rafael França	2016-07-17	4	-0/+95
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	jeremywadsack/use_transactional_fixtures_all_databases Use notification to ensure that lazy-loaded model classes have transactions
\| * \| \| \| \| \| \|	Create connection.active_record notification and use that to ensure that lazy-	Jeremy Wadsack	2016-07-12	4	-0/+95
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	loaded model classes have their connections wrapped in transactions. See #17776 In Rails 4 config.eager_load was changed to false in the test environment. This means that model classes that connect to alternate databases with establish_connection are not loaded at start up. If use_transactional_fixtures is enabled, transactions are wrapped around the connections that have been established only at the start of the test suite. So model classes loaded later don't have transactions causing data created in the alternate database not to be removed. This change resolves that by creating a new connection.active_record notification that gets fired whenever a connection is established. I then added a subscriber after we set up transactions in the test environment to listen for additional connections and wrap those in transactions as well.
* \| \| \| \| \| \| \|	Merge pull request #25811 from oss92/to_sentence_fallback_string	Rafael França	2016-07-17	3	-3/+20
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added :fallback_string option to Array#to_sentence
\| * \| \| \| \| \| \| \|	Added :fallback_string option to Array#to_sentence	oss92	2016-07-13	3	-3/+20
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Enable a few more rubocop rules	Rafael Mendonça França	2016-07-17	1	-0/+13
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #25650 from ↵	Rafael França	2016-07-17	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	prathamesh-sonpatki/add-note-about-changelog-at-the-top Add a note about adding CHANGELOG entries at the top of the file
\| * \| \| \| \| \| \| \| \|	Add a note about adding CHANGELOG entries at the top of the file [ci skip]	Prathamesh Sonpatki	2016-07-02	1	-0/+3
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #25864 from vipulnsward/fix-ap-test	Rafael França	2016-07-17	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix failing requirement of duplicable in ParameterFilter
\| * \| \| \| \| \| \| \| \| \|	Fix failing requirement of duplicable in ParameterFilter	Vipul A M	2016-07-16	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #25850 from ojab/layout_doc_fix	Rafael Mendonça França	2016-07-17	1	-1/+4
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mention that layout can call a Proc [ci skip]
\| * \| \| \| \| \| \| \| \| \|	Mention that layout can call a Proc [ci skip]	ojab	2016-07-15	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also document return values for Proc/Symbol arguments
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #25861 from vipulnsward/fix-grammer	Rafael França	2016-07-17	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix CHANGELOG grammar [ci skip]
\| * \| \| \| \| \| \| \| \| \| \|	Fix CHANGELOG grammar [ci skip]	Vipul A M	2016-07-16	1	-2/+2
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #25860 from prathamesh-sonpatki/add-cg-for-rails-initializers	Rafael França	2016-07-17	3	-3/+16
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CHANGELOG for https://github.com/rails/rails/pull/25257 [ci skip]
\| * \| \| \| \| \| \| \| \| \| \|	CHANGELOG for https://github.com/rails/rails/pull/25257 [ci skip]	Prathamesh Sonpatki	2016-07-17	3	-3/+16
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Also minor weekly CHANGELOG cleanup.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #25815 from greysteil/add-newline-between-structure-versions	Rafael França	2016-07-16	2	-2/+9
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add newline between each migration in `structure.sql`
\| * \| \| \| \| \| \| \| \| \| \|	Add newline between each migration in `structure.sql`	Grey Baker	2016-07-14	2	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Keeps schema migration inserts as a single commit, so we still get all of the benefits of https://github.com/rails/rails/commit/42dd2336b31a8d98776d039a2b9fd7f834156a78, but allows for easier git diff-ing. Fixes #25504.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #25775 from ↵	Eileen M. Uchitelle	2016-07-16	1	-1/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	junaruga/hotfix/actionpack-depending-on-activerecord Remove unused activerecord requirement in actionpack.
\| * \| \| \| \| \| \| \| \| \| \| \|	Remove unused activerecord requirement in actionpack.	Jun Aruga	2016-07-11	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #25854 from prathamesh-sonpatki/fix-test-name	Eileen M. Uchitelle	2016-07-16	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix wrong test name
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix wrong test name	Prathamesh Sonpatki	2016-07-16	1	-1/+1
\|/ / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Followup of https://github.com/rails/rails/pull/23179
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #25853 from CodingItWrong/remove-reference-indexes-in-docs	Vipul A M	2016-07-16	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update references generation docs to exclude index
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Update references generation docs to exclude index	Josh Justice	2016-07-16	1	-2/+2
\|/ / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In #23179 the migration generator was changed to no longer output `index: true` for `references` migrations. This updates the migrations guide to remove `index: true` from relevant examples. [ci skip]
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #25851 from y-yagi/add_missing_braces	Vipul A M	2016-07-15	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|	add missing braces [ci skip]
\| * \| \| \| \| \| \| \| \| \| \| \|	add missing braces [ci skip]	yuuji.yaginuma	2016-07-16	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also modify to use Ruby 1.9+ syntax.