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

	Commit message (Expand)	Author	Age	Files	Lines
*	Allow release when CHANGELOG is changed	Rafael Mendonça França	2015-08-24	1	-1/+1
*	remove useless case in #resolve_layout.	Nick Sutterer	2015-08-24	1	-2/+0
*	remove LookupContext#with_layout_format by passing formats for layouts explic...	Nick Sutterer	2015-08-24	3	-24/+11
*	Merge pull request #21354 from yui-knk/fix/migration_file_timestamp	Robin Dupret	2015-08-24	2	-2/+2
\|\
\| *	[ci skip] Fix migration file's timestamp	yui-knk	2015-08-24	2	-2/+2
* \|	Merge pull request #21339 from deepj/unused-block-arguments	Carlos Antonio da Silva	2015-08-24	2	-3/+3
\|\ \
\| * \|	Remove unused block arguments	deepj	2015-08-23	2	-3/+3
* \| \|	Merge pull request #21355 from akihiro17/remove-variables	Rafael Mendonça França	2015-08-24	1	-2/+2
\|\ \ \
\| * \| \|	Remove unused variables	akihiro17	2015-08-24	1	-2/+2
* \| \| \|	Merge pull request #21342 from yui-knk/test/add_assert_method	Rafael Mendonça França	2015-08-24	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Add `assert_nothing_raised` to make clear test case perpose	yui-knk	2015-08-23	1	-1/+1
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #21267 from davidcornu/rails-server-port-env-var	Rafael Mendonça França	2015-08-24	3	-1/+12
\|\ \ \ \
\| * \| \| \|	Use the PORT environment variable for rails server	David Cornu	2015-08-18	3	-1/+12
* \| \| \| \|	Further fix failing tests caused by #21350	Sean Griffin	2015-08-24	1	-0/+1
* \| \| \| \|	Fix failing tests caused by #21350	Sean Griffin	2015-08-24	1	-0/+1
* \| \| \| \|	Merge pull request #21350 from agis-/issue-21223	Sean Griffin	2015-08-24	6	-1/+18
\|\ \ \ \ \
\| * \| \| \| \|	Only nullify persisted has_one target associations	Agis-	2015-08-24	6	-1/+18
* \| \| \| \| \|	Merge pull request #21091 from y-yagi/add_activejob_section_to_instrumentatio...	Yves Senn	2015-08-24	1	-0/+32
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
\| * \| \| \| \|	add Active Job section to instrumentation guide [ci skip]	yuuji.yaginuma	2015-08-02	1	-0/+32
* \| \| \| \| \|	Merge pull request #21321 from rodzyn/removing_mocha	Kasper Timm Hansen	2015-08-24	10	-78/+103
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Get rid of mocha tests - part 1	Marcin Olichwirowicz	2015-08-24	10	-78/+103
* \| \| \| \| \| \|	Merge pull request #21320 from piton4eg/patch-8	Yves Senn	2015-08-24	1	-7/+8
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Fix docs for debugging [ci skip]:	Alexey Markov	2015-08-24	1	-7/+8
* \| \| \| \| \| \| \|	guides, move incomplete example to corresponding option. #21349	Yves Senn	2015-08-24	1	-2/+4
\| \|_\|_\|/ / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #21347 from ronakjangir47/remove_mocha_actionview	Kasper Timm Hansen	2015-08-24	8	-81/+105
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Removed Mocha from ActionView part 1	Ronak Jangir	2015-08-24	8	-81/+105
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master' of github.com:rails/rails	Vijay Dev	2015-08-24	456	-4925/+7457
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	Merge pull request #21348 from yui-knk/fix/about_comma_style_2	Vijay Dev	2015-08-24	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \|	[ci skip] Fix the grammar	yui-knk	2015-08-24	1	-1/+1
\| \|/ / / / / /
\| * \| \| \| \| \|	use methods on the request object instead of accessing env	Aaron Patterson	2015-08-23	1	-7/+7
\| * \| \| \| \| \|	use `Request#path_info` instead of direct ENV access	Aaron Patterson	2015-08-23	1	-1/+1
\| * \| \| \| \| \|	remove env access from debug_exceptions	Aaron Patterson	2015-08-23	1	-10/+9
\| * \| \| \| \| \|	remove more `env` access	Aaron Patterson	2015-08-23	1	-11/+19
\| * \| \| \| \| \|	remove more env access	Aaron Patterson	2015-08-23	1	-3/+3
\| * \| \| \| \| \|	remove more env access	Aaron Patterson	2015-08-23	1	-4/+6
\| * \| \| \| \| \|	convert more `@env` access to get / set header	Aaron Patterson	2015-08-23	2	-12/+14
\| * \| \| \| \| \|	remove usage of `@env`	Aaron Patterson	2015-08-23	1	-3/+5
\| * \| \| \| \| \|	Merge pull request #21341 from yui-knk/fix/ar_test_remove_innermethod	Yves Senn	2015-08-23	1	-5/+1
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Remove test helper method to inside test method	yui-knk	2015-08-23	1	-5/+1
\| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge pull request #21340 from ronakjangir47/request_object	Yves Senn	2015-08-23	1	-3/+3
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Another place to use a request object in NullSessionHash	Ronak Jangir	2015-08-23	1	-3/+3
\| \| \|/ / / / /
\| * \| \| \| \| \|	Merge pull request #21343 from shunsukeaida/remove_broken_link	Arun Agrawal	2015-08-23	1	-1/+1
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Remove a link to the site that seems to be gone. [ci skip]	shunsukeaida	2015-08-23	1	-1/+1
\| \| \|/ / / / /
\| * \| \| \| \| \|	Merge pull request #21332 from ronakjangir47/take_docs	Eileen M. Uchitelle	2015-08-23	1	-0/+25
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| \| * \| \| \| \|	Added docs for CollectionProxy#take [ci skip]	Ronak Jangir	2015-08-23	1	-0/+25
\| * \| \| \| \| \|	Merge pull request #21338 from y-yagi/fix_strip_links_example	Abdelkader Boudih	2015-08-23	1	-2/+2
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	fix syntax error in strip_links example [ci skip]	yuuji.yaginuma	2015-08-23	1	-2/+2
\| * \| \| \| \| \| \|	Merge pull request #21335 from yui-knk/refactor/remove_not_used_block_arg	Yves Senn	2015-08-23	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \|	Remove not used a block argument (`&block`)	yui-knk	2015-08-23	1	-1/+1
\| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge pull request #21334 from yui-knk/doc/about_comma_style	Richard Schneeman	2015-08-22	1	-0/+5
\| \|\ \ \ \ \ \