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

	Commit message (Expand)	Author	Age	Files	Lines
*	update copyright notices to 2014. [ci skip]	Vipul A M	2014-01-01	14	-14/+14
*	Improve the tests to not call assert_nothing_raised	Rafael Mendonça França	2014-01-01	1	-4/+1
*	Merge pull request #13550 from vipulnsward/13437-fix	Rafael Mendonça França	2014-01-01	3	-1/+22
\|\
\| *	https://github.com/rails/rails/commit/2075f39d726cef361170218fd16421fc52bed5a...	Vipul A M	2013-12-31	3	-1/+22
* \|	Merge pull request #13556 from yahonda/update_mysql_grant	Rafael Mendonça França	2014-01-01	3	-2/+4
\|\ \
\| * \|	Change the inexistent database name to inexistent_activerecord_unittest	Yasuo Honda	2014-01-01	2	-2/+2
\| * \|	Update grant statement to address #13549	Yasuo Honda	2014-01-01	1	-0/+2
* \| \|	Merge pull request #13561 from robin850/issue-11723	Rafael Mendonça França	2014-01-01	2	-2/+10
\|\ \ \
\| * \| \|	Avoid raising a NameError on FreeBSD using Date	Robin Dupret	2014-01-01	2	-2/+10
* \| \| \|	Merge pull request #13559 from JuanitoFatas/action-controller	Robin Dupret	2014-01-01	1	-2/+5
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	[ci skip] Add missing flash message in block filter example.	Juanito Fatas	2014-01-01	1	-2/+5
* \| \| \|	Merge pull request #13558 from bcardarella/bc-fix-example-syntax	Arun Agrawal	2014-01-01	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Fix comment syntax	Brian Cardarella	2013-12-31	1	-1/+1
* \| \| \|	Allow engine root relative redirects using an empty string.	Andrew White	2014-01-01	3	-49/+149
\|/ / /
* \| \|	Merge pull request #13419 from amrnt/nullize-enum	Godfrey Chan	2013-12-31	3	-1/+43
\|\ \ \
\| * \| \|	Add the ability to nullify the `enum` column	Amr Tamimi	2014-01-01	3	-1/+43
\|/ / /
* \| \|	Merge remote-tracking branch 'origin/master'	Rafael Mendonça França	2013-12-31	10	-42/+232
\|\\| \|
\| * \|	Merge pull request #13470 from strzalek/variants-all-any	David Heinemeier Hansson	2013-12-31	5	-27/+217
\| \|\ \
\| \| * \|	Add any/all support for variants	Łukasz Strzałkowski	2013-12-26	5	-27/+217
\| * \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2013-12-31	5	-15/+15
\| \|\ \ \
\| \| * \| \|	Fix few typos and improve markup at some levels	Robin Dupret	2013-12-24	4	-5/+5
\| \| * \| \|	[ci skip] trailing documentation whitespace	schneems	2013-12-19	1	-10/+10
* \| \| \| \|	Improve tests to use only public API	Rafael Mendonça França	2013-12-31	1	-3/+2
* \| \| \| \|	Merge pull request #13525 from huoxito/make-outer-joins-on-proper-parent	Rafael Mendonça França	2013-12-31	2	-2/+12
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Make outer joins on proper parent	Washington Luiz	2013-12-31	2	-2/+12
* \| \| \| \|	Merge pull request #13131 from gja/changed-accepts-values	Godfrey Chan	2013-12-30	3	-2/+22
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Allows you to check if an attribute has changed to a particular value	Tejas Dinkar	2013-12-15	3	-2/+22
* \| \| \| \|	Merge pull request #13541 from schneems/schneems/db-url-sub-key	Rafael Mendonça França	2013-12-30	3	-0/+32
\|\ \ \ \ \
\| * \| \| \| \|	Allow "url" sub key in database.yml configuration	schneems	2013-12-30	3	-0/+32
\|/ / / / /
* \| \| \| \|	Merge pull request #13536 from schneems/schneems/connection-spec-docs	Richard Schneeman	2013-12-30	1	-14/+80
\|\ \ \ \ \
\| * \| \| \| \|	[ci skip] ConnectionSpecification::Resolver Docs	schneems	2013-12-30	1	-14/+80
* \| \| \| \| \|	Merge pull request #13539 from StevenNunez/patch-1	Xavier Noria	2013-12-30	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Update explanation to match example	Steven Nunez	2013-12-30	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	tidy AR CHANGELOG. [ci skip]	Yves Senn	2013-12-30	1	-4/+7
* \| \| \| \| \|	Merge pull request #13538 from robin850/patch-14	Yves Senn	2013-12-30	1	-0/+12
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add a missing changelog entry for #13534 [ci skip]	Robin Dupret	2013-12-30	1	-0/+12
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Remove deprecation warning for FIXTURES_PATH	Piotr Sarnacki	2013-12-30	1	-6/+0
* \| \| \| \| \|	Revert "Install bundle gems to the system not to vendor/bundle"	Piotr Sarnacki	2013-12-30	1	-1/+0
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #13535 from schneems/schneems/extract-url-logic	Rafael Mendonça França	2013-12-29	1	-34/+79
\|\ \ \ \ \
\| * \| \| \| \|	Extract db url connection logic to class	schneems	2013-12-29	1	-34/+79
\| \|/ / / /
* \| \| \| \|	Merge pull request #13527 from kuldeepaggarwal/f-independent-specs	José Valim	2013-12-29	3	-3/+6
\|\ \ \ \ \
\| * \| \| \| \|	used user-defined configurations for running tests that might depend on user'...	Kuldeep Aggarwal	2013-12-29	3	-3/+6
* \| \| \| \| \|	Merge pull request #13534 from kuldeepaggarwal/f-where-not	José Valim	2013-12-29	2	-0/+8
\|\ \ \ \ \ \
\| * \| \| \| \| \|	raise `ArgumentError` exception if `Model.where.not` is called with `nil` arg...	Kuldeep Aggarwal	2013-12-30	2	-0/+8
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Fix Encoding::CompatibilityError when public path is UTF-8	Andrew White	2013-12-29	8	-6/+41
* \| \| \| \| \|	Fix method redefined warning message in mapper.rb	Andrew White	2013-12-29	1	-2/+3
\|/ / / / /
* \| \| \| \|	Install bundle gems to the system not to vendor/bundle	Piotr Sarnacki	2013-12-29	1	-0/+1
* \| \| \| \|	blank? and present? commit to return singletons [Xavier Noria & Pavel Pravosud]	Xavier Noria	2013-12-28	3	-25/+57
* \| \| \| \|	Merge pull request #13517 from jetthoughts/13516_blank_to_return_true_false	Xavier Noria	2013-12-28	1	-1/+3
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Extracted blank matcher regexp to constant	Paul Nikitochkin	2013-12-28	1	-1/+3
\|/ / / /