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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #19753 from jonatack/use-ruby-2-2-2	Guillermo Iguaran	2015-04-13	12	-15/+15
\|\
\| *	Upgrade to Ruby 2.2.2	Jon Atack	2015-04-14	12	-15/+15
* \|	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2015-04-14	7	-48/+34
\|\ \
\| * \|	[ci skip] add missing file extension	Mikhail Dieterle	2015-04-10	1	-1/+1
\| * \|	[ci skip] format rake output	Mikhail Dieterle	2015-04-10	1	-5/+3
\| * \|	[ci skip] fix helper name	Mikhail Dieterle	2015-04-10	1	-1/+1
\| * \|	[ci skip] Wrap with double quotation	yui-knk	2015-04-10	1	-1/+1
\| * \|	[ci skip] Add `,`	yui-knk	2015-04-08	1	-1/+1
\| * \|	[ci skip] Remove unnecessary lines	yui-knk	2015-04-01	1	-2/+0
\| * \|	[ci skip] Add `:`	yui-knk	2015-04-01	1	-1/+1
\| * \|	No need to mention unit tests in testing guide anymore	Kir Shatrov	2015-03-31	1	-2/+0
\| * \|	New test runner syntax in testing guide	Kir Shatrov	2015-03-31	1	-4/+4
\| * \|	Suggest new hash syntax in testing guide	Kir Shatrov	2015-03-31	1	-2/+2
\| * \|	[ci skip] Remove unnecessary `>`	yui-knk	2015-03-31	1	-1/+1
\| * \|	Don't suggest `bin/rails test controllers`	Kir Shatrov	2015-03-31	1	-1/+0
\| * \|	Add missing "of" to testing guide.	Hendy Tanata	2015-03-30	1	-1/+1
\| * \|	Merge branch 'kirs'	Matthew Draper	2015-03-30	1	-30/+23
\| \|\ \
\| \| * \|	Switch to `bin/rails test` in testing guide	Kir Shatrov	2015-03-30	1	-30/+23
* \| \| \|	Merge pull request #19742 from vngrs/config_autoload_paths_wrong_doc	Carlos Antonio da Silva	2015-04-13	1	-3/+1
\|\ \ \ \
\| * \| \| \|	Fix the wrong documentation about config.autoload_paths [ci skip]	Mehmet Emin İNAÇ	2015-04-13	1	-3/+1
* \| \| \| \|	Improve note about unique index and foreign key on has_one association	Carlos Antonio da Silva	2015-04-13	1	-6/+7
* \| \| \| \|	Merge pull request #19741 from greysteil/add-note-about-partial-index-support	Yves Senn	2015-04-13	1	-0/+2
\|\ \ \ \ \
\| * \| \| \| \|	Document that partial indexes are only supported by Postgres and SQLite.	Grey Baker	2015-04-13	2	-0/+8
\|/ / / / /
* \| \| \| \|	Merge branch 'feature/doc_request_forgery_protection_for_api'	Zachary Scott	2015-04-12	1	-7/+17
\|\ \ \ \ \
\| * \| \| \| \|	Add note regarding CSRF for APIs, as a use-case for skipping it [ci skip]	Zachary Scott	2015-04-12	1	-0/+4
\| * \| \| \| \|	Apply comments from @jeremy regarding why HTML and Javascript requests	Zachary Scott	2015-04-12	1	-0/+5
\| * \| \| \| \|	update request_forgery_protection docs [ci skip]	Vladimir Lyzo	2015-04-12	1	-7/+8
\|/ / / / /
* \| \| \| \|	Add a note regarding add_column restricted API [ci skip]	Zachary Scott	2015-04-12	1	-0/+4
* \| \| \| \|	Merge branch 'master' of github.com:rails/rails	Zachary Scott	2015-04-12	3	-31/+3
\|\ \ \ \ \
\| * \| \| \| \|	Revert "Merge pull request #19682 from supercaracal/fix_force_ssl_redirection...	Santiago Pastorino	2015-04-12	3	-31/+3
* \| \| \| \| \|	Add note wrt foreign key constraint to ensure data integrity	Zachary Scott	2015-04-12	1	-0/+10
\|/ / / / /
* \| \| \| \|	Apply edits from @senny to close #19397 [ci skip]	Zachary Scott	2015-04-12	1	-4/+1
* \| \| \| \|	Apply comments from @rafaelfranca: we shouldn't recommend you use scaffold css	Zachary Scott	2015-04-12	1	-9/+0
* \| \| \| \|	Merge branch 'patch-1'	Zachary Scott	2015-04-12	1	-3/+5
\|\ \ \ \ \
\| * \| \| \| \|	Enhance documentation of pluck with a hint to ids [ci skip]	wingfire	2015-04-12	1	-3/+5
* \| \| \| \| \|	Merge pull request #19564 from jonatack/counter_cache_docs	Zachary Scott	2015-04-12	1	-3/+11
\|\ \ \ \ \ \
\| * \| \| \| \| \|	[skip ci] Fix counter_cache in the Rails Guides	Jon Atack	2015-03-28	1	-3/+11
* \| \| \| \| \| \|	Fix (intermittent?) test failure	Matthew Draper	2015-04-13	1	-1/+1
* \| \| \| \| \| \|	Merge pull request #19738 from ojab/squish	Xavier Noria	2015-04-12	1	-2/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Speedup String#squish	ojab	2015-04-12	1	-2/+1
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'nishantmodak-view_paths'	Zachary Scott	2015-04-12	1	-1/+33
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Some copy edits for modifying View Paths [ci skip]	Zachary Scott	2015-04-12	1	-5/+21
\| * \| \| \| \| \| \|	Merge branch 'view_paths' of https://github.com/nishantmodak/rails into nisha...	Zachary Scott	2015-04-12	1	-1/+17
\|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	view paths docs [ci skip]	Nishant Modak	2015-04-13	1	-1/+17
* \| \| \| \| \| \| \|	Merge branch 'mfazekas-action-mailer-async-doc-fixes'	Zachary Scott	2015-04-12	1	-8/+11
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Since the delegator wasn't identified earlier, we should here [ci skip]	Zachary Scott	2015-04-12	1	-2/+2
\| * \| \| \| \| \| \| \|	Merge branch 'action-mailer-async-doc-fixes' of https://github.com/mfazekas/r...	Zachary Scott	2015-04-12	1	-8/+11
\|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fixes to inaccurate documentation in action_mailer [ci skip]	Miklos Fazkeas	2014-12-18	1	-8/+11
* \| \| \| \| \| \| \| \|	:scissors:	Zachary Scott	2015-04-12	1	-2/+2
\| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #19735 from Dan-Burnette/fixSecretKeyBaseErrorMessage	Godfrey Chan	2015-04-12	1	-1/+1
\|\ \ \ \ \ \ \ \