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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \|	[ci skip] Fix link format	yui-knk	2015-03-15	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	[ci skip] Remove spaces	yui-knk	2015-03-14	1	-27/+27
\| \| \| \| \|
\| * \| \| \|	[ci skip] Add space after erb block.	yui-knk	2015-03-12	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	[ci skip] Add space after erb block.	yui-knk	2015-03-12	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Add backquote to :as option.	yui-knk	2015-03-11	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	[ci skip] Remove unnecessary space	yui-knk	2015-03-04	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	[ci skip] Fix fenced code block lang	yui-knk	2015-03-03	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	[ci skip] Add `.`	yui-knk	2015-03-03	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #19521 from mudphone/test_fixture_docs	Arthur Nogueira Neves	2015-03-25	1	-2/+2
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|	[skip ci] Minor edits for clarity in the test fixture guide.
\| * \| \| \|	[skip ci] Minor edits for clarity, to make smooth, & separate clauses.	Kyle Oba	2015-03-25	1	-2/+2
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Add conjunction for clarity. * Add comma between independent clauses: create command, and generation of fixtures.
* \| \| \|	Merge pull request #19496 from andreynering/docs-migrations-change	Kasper Timm Hansen	2015-03-25	1	-0/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Documenting remove_column as a reversible migration method
\| * \| \| \|	Documenting remove_column as a reversible migration method [ci skip]	Andrey Nering	2015-03-25	1	-0/+8
\|/ / / /
* \| \| \|	Merge pull request #19503 from jasoncodes/no-psqlrc	Yves Senn	2015-03-25	3	-3/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid loading user's psqlrc when loading test structure
\| * \| \| \|	Avoid loading user's psqlrc when loading test structure	Jason Weathered	2015-03-25	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #19507 from jonatack/ar-validations-guide-fixes	Kasper Timm Hansen	2015-03-25	1	-3/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	[skip ci] Active Record Validations guide fixes
\| * \| \| \| \|	[ci skip] Active Record Validations guide fixes	Jon Atack	2015-03-25	1	-3/+5
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Remove deprecated `[]=` - Fix duplicate `errors#add` example. The second code example was originally `[]=`, replace it with `[] <<`. - Improve explanations for `errors#add` and `errors#full_messages` Follow-up to PR #19457 (closed after borking my git history). Apologies for the duplicate PR. cc @kaspth
* \| \| \| \|	Merge pull request #19504 from y-yagi/fix_digest_explain	Claudio B.	2015-03-24	1	-2/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	update `config.assets.digest` default value in guides [ci skip]
\| * \| \| \|	update `config.assets.digest` default value in guides [ci skip]	yuuji.yaginuma	2015-03-25	1	-2/+1
\|/ / / /
* \| \| \|	Merge pull request #19502 from kaspth/assert-select-failure-output	Rafael Mendonça França	2015-03-24	1	-0/+24
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	[ci skip] Update 4.2 Release notes with more assert_select information.
\| * \| \| \|	[ci skip] Update 4.2 Release notes with more assert_select information.	Kasper Timm Hansen	2015-03-24	1	-0/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds documentation for substitutions and why Regexp substitions look different when assertion fails.
* \| \| \| \|	Merge pull request #19499 from swalkinshaw/patch-1	Arthur Nogueira Neves	2015-03-24	1	-7/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Update ActiveSupport::Subscriber docs
\| * \| \| \|	Update ActiveSupport::Subscriber docs	Scott Walkinshaw	2015-03-24	1	-7/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For consistency purposes with the changes done in https://github.com/rails/rails/pull/12285
* \| \| \| \|	Add changelog entry for #19271	Arthur Neves	2015-03-24	1	-0/+7
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Revert "Merge pull request #19500 from ccutrer/dry_sti_subclass_finding"	Rafael Mendonça França	2015-03-24	1	-19/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 5cfa6a8ab997089c3012a82052c8c317b2e095f5, reversing changes made to bfd5bf8313e6ea0bb2eccb68ee5076bb63f0b2db. Reason: This broken travis build.
* \| \| \|	Merge pull request #19500 from ccutrer/dry_sti_subclass_finding	Rafael Mendonça França	2015-03-24	1	-19/+19
\|\ \ \ \ \| \|/ / / \|/\| \| \|	DRY up STI subclass logic
\| * \| \|	DRY up STI subclass logic	Cody Cutrer	2015-03-24	1	-19/+19
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the newer method used for discriminating new records did not use the older and more robust method used for instantiating existing records, but did have a better post-check to ensure the sublass was in the hierarchy. so move the descendants check to find_sti_class, and then simply call find_sti_class from subclass_from_attributes
* \| \|	Merge pull request #19452 from ↵	Carlos Antonio da Silva	2015-03-24	3	-1/+19
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pinglamb/fix-referencing-wrong-alias-when-joining-tables-of-has-many-through-association Fix referencing wrong aliases while joining tables of has many through association
\| * \| \|	Fix referencing wrong aliases while joining tables of has many through	pinglamb	2015-03-22	3	-1/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	association While joining table of has_many :through association, ActiveRecord will use the actual table name instead of through-join alias. It results with a wrong SQL and exception is raised. This only happens when calculation methods like #count is called. This issue is affecting Rails 4.1.x and 4.2.x as well.
* \| \| \|	Merge pull request #19493 from larskanis/add_infinity_test	Yves Senn	2015-03-24	1	-0/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	PostgreSQL, Add test case for "Infinity" string assignment to float columns
\| * \| \| \|	PostgreSQL, Add test case for "Infinity" string assignment to float columns.	Lars Kanis	2015-03-22	1	-0/+9
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	This is implemented in Type::Float, but not tested, so far.
* \| \| \|	Merge pull request #19488 from yui-knk/fix/comment2	Yves Senn	2015-03-24	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	[ci skip] Remove unacceptable method name
\| * \| \| \|	[ci skip] Remove unacceptable method name	yui-knk	2015-03-24	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #19491 from tgxworld/fix_incorrect_description	Yves Senn	2015-03-24	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Fix incorrect description for `assert_nothing_raised`. [ci skip]
\| * \| \| \|	Fix incorrect description for `assert_nothing_raised`.	Guo Xiang Tan	2015-03-24	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #19485 from tgxworld/small_doc_fix	Rafael Mendonça França	2015-03-24	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Small doc fix. [CI SKIP]
\| * \| \| \|	Small doc fix. [CI SKIP]	Guo Xiang Tan	2015-03-24	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #19481 from davidcornu/activesupport/normalize-to-sentence	Arthur Nogueira Neves	2015-03-23	2	-1/+7
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|	Make sure Array#to_sentence always returns a String
\| * \| \| \|	Make sure Array#to_sentence always returns a String	David Cornu	2015-03-23	2	-1/+7
\| \|/ / /
* \| \| \|	Merge pull request #19482 from mperham/master	Rafael Mendonça França	2015-03-23	2	-7/+22
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Pass wrapped class name to Sidekiq for logging purposes
\| * \| \|	Pass wrapped class name to Sidekiq for logging purposes	Mike Perham	2015-03-23	2	-7/+22
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sidekiq logs the name of the job class being performed. Because ActiveJob wraps the class, this means every job logs as an AJ::JobWrapper instead of the actual class name. Will help fix mperham/sidekiq#2248
* \| \|	Merge pull request #19475 from tgxworld/no_one_has_to_suck_anymore	Rafael Mendonça França	2015-03-23	2	-13/+0
\|\ \ \ \| \| \| \| \| \| \| \|	Remove alias for `i_suck_and_my_tests_are_order_dependent`.
\| * \| \|	Remove alias for `i_suck_and_my_tests_are_order_dependent`.	Guo Xiang Tan	2015-03-24	2	-13/+0
\|/ / /
* \| \|	Fix failing tests for #19474	Andrew White	2015-03-23	1	-2/+2
\| \| \|
* \| \|	Fix ActionDispatch::PublicExceptions returning string rack status	Ryan Tomayko	2015-03-23	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The status returned in the rack [status, headers, body] array was a string, which can cause problems with middleware that assumes the status will be a Fixnum. This likely never surfaced because other middleware to_i the status returned from downstream apps before passing it on.
* \| \|	Merge pull request #19473 from nerdinand/duration-to_i-documentation	Yves Senn	2015-03-23	1	-0/+24
\|\ \ \ \| \| \| \| \| \| \| \|	Add documentation for Duration#to_i for clarification
\| * \| \|	Add documentation for Duration#to_i for clarification	nerdinand	2015-03-23	1	-0/+24
\|/ / /
* \| \|	Merge pull request #19471 from ↵	Yves Senn	2015-03-23	2	-30/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nerdinand/remove-activesupport-integer-example-doc Remove reference to Numeric#from_now, as it is no longer supported [ci skip]
\| * \| \|	Remove reference to Numeric#from_now, as it is no longer supported	nerdinand	2015-03-23	2	-30/+0
\|/ / /
* \| \|	Merge pull request #19449 from Gaurav2728/gaurav-unavailable_link	Rafael Mendonça França	2015-03-23	4	-7/+4
\|\ \ \ \| \| \| \| \| \| \| \|	remove old unavailable link with relevant fix patch 1
\| * \| \|	remove old unavailable link with relevant fix	Gaurav Sharma	2015-03-23	4	-7/+4
\| \| \| \|