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

	Commit message (Expand)	Author	Age	Files	Lines
...
\| * \|	Updating the guides for Enumerable#pluck	Kevin Deisz	2015-05-28	1	-0/+10
\|/ /
* \|	Merge pull request #20341 from vngrs/remove_already_defined_methods_in_rack_r...	Rafael Mendonça França	2015-05-28	1	-36/+0
\|\ \
\| * \|	Remove already defined methods in super class of ActionDispatch::Request class	Mehmet Emin İNAÇ	2015-05-28	1	-36/+0
* \| \|	Merge pull request #20346 from repinel/remove-mocha2	Rafael Mendonça França	2015-05-28	4	-59/+117
\|\ \ \
\| * \| \|	Remove use of mocha from Active Model	Roque Pinel	2015-05-28	4	-59/+117
* \| \| \|	Merge pull request #20267 from kaspth/fix-minitest-constant-clashing	Rafael Mendonça França	2015-05-28	8	-43/+45
\|\ \ \ \
\| * \| \| \|	Avoid E constant clashing with Minitest defined version.	Kasper Timm Hansen	2015-05-22	8	-43/+45
* \| \| \| \|	Merge pull request #20350 from kddeisz/enumerable_pluck	Rafael Mendonça França	2015-05-28	3	-0/+20
\|\ \ \ \ \
\| * \| \| \| \|	Add Enumerable#pluck.	Kevin Deisz	2015-05-28	3	-0/+20
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #20347 from repinel/fix-reflection-shadowing	Rafael Mendonça França	2015-05-28	1	-2/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Fix the shadowing warning for `reflection`	Roque Pinel	2015-05-28	1	-2/+2
\|/ / / /
* \| \| \|	Persist user provided default values, even if unchanged	Sean Griffin	2015-05-28	4	-27/+21
* \| \| \|	Allow proc defaults with the Attributes API	Sean Griffin	2015-05-28	3	-1/+36
* \| \| \|	Merge pull request #20017 from eliotsykes/configurable-static-index-filename	Rafael Mendonça França	2015-05-28	12	-8/+65
\|\ \ \ \
\| * \| \| \|	config.static_index configures directory index "index.html" filename	Eliot Sykes	2015-05-28	12	-8/+65
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #20331 from arunagw/arunagw-remove-unused-package-tasks	Rafael Mendonça França	2015-05-28	8	-62/+2
\|\ \ \ \
\| * \| \| \|	Remove unused package tasks	Arun Agrawal	2015-05-28	8	-62/+2
\| \|/ / /
* \| \| \|	Merge pull request #20344 from jcockhren/fix_docs_presence_validation	Lauro Caetano	2015-05-28	1	-1/+0
\|\ \ \ \
\| * \| \| \|	removed erroneous line. Corrected presence validation example.	Jurnell Cockhren	2015-05-28	1	-1/+0
\|/ / / /
* \| \| \|	Merge pull request #20313 from s3ymd/master	Arthur Nogueira Neves	2015-05-28	1	-1/+1
\|\ \ \ \
\| * \| \| \|	[ci skip] Fix block parameter of assert_no_difference	Hiromichi Yamada	2015-05-28	1	-1/+1
* \| \| \| \|	Merge pull request #20336 from vngrs/deprecate_nothing_option_for_render_method	Santiago Pastorino	2015-05-28	13	-49/+38
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Deprecate `:nothing` option for render method	Mehmet Emin İNAÇ	2015-05-28	13	-49/+38
\| \|/ / /
* \| \| \|	Merge pull request #20332 from henders/shender/changelog_reload_credit	Arun Agrawal	2015-05-28	1	-2/+2
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Give credit to extra contributor for Base.reload fix	Shane Hender	2015-05-28	1	-2/+2
\|/ / /
* \| \|	Merge pull request #20196 from huoxito/preload-association-and-merges	Rafael Mendonça França	2015-05-28	2	-2/+50
\|\ \ \
\| * \| \|	Properly append preload / includes args on Merger	Washington Luiz	2015-05-28	2	-2/+50
* \| \| \|	Merge pull request #20263 from arunagw/aa-remove-custom-lines-actionview	Rafael Mendonça França	2015-05-28	1	-21/+3
\|\ \ \ \
\| * \| \| \|	Remove custom `lines` and use `/tools/line_statistics`	Arun Agrawal	2015-05-22	1	-21/+3
* \| \| \| \|	Merge pull request #20041 from akshay-vishnoi/sqlite_collation	Rafael Mendonça França	2015-05-28	6	-9/+139
\|\ \ \ \ \
\| * \| \| \| \|	Add collation support for string and text columns in SQLite3	Akshay Vishnoi	2015-05-28	6	-9/+139
* \| \| \| \| \|	Add test to 57daaef	Rafael Mendonça França	2015-05-28	1	-1/+1
* \| \| \| \| \|	Allow Relation#compact using delegation	Jordan Raine	2015-05-28	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #20329 from EduardoBautista/json-api-support	Rafael Mendonça França	2015-05-27	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Add application/vnd.api+json alias to the JSON MIME Type.	Eduardo Bautista	2015-05-27	1	-1/+1
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #20171 from georgeclaghorn/enums-in-fixtures	Rafael Mendonça França	2015-05-27	6	-32/+64
\|\ \ \ \ \
\| * \| \| \| \|	Resolve enums in test fixtures	George Claghorn	2015-05-27	6	-32/+64
* \| \| \| \| \|	Merge pull request #19886 from henders/henders/reload_wipe_query_cache	Rafael Mendonça França	2015-05-27	3	-1/+34
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Cause ActiveRecord::Base::reload to also ignore the QueryCache.	Shane Hender	2015-04-28	2	-1/+30
* \| \| \| \| \| \|	Merge pull request #17654 from kamipo/strict_mode_explicitly	Rafael Mendonça França	2015-05-27	3	-2/+22
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	If specify `strict: :default` explicitly, do not set sql_mode.	Ryuta Kamizono	2015-05-26	3	-2/+22
* \| \| \| \| \| \|	Merge pull request #20269 from wojobucco/master	Rafael Mendonça França	2015-05-27	3	-4/+9
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Changed mysqldump to include sprocs and functions	Jonathan Worek	2015-05-22	2	-4/+5
* \| \| \| \| \| \| \|	Merge pull request #20326 from hderms/dh/fix_task_bug	Rafael Mendonça França	2015-05-27	2	-16/+66
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	add fixed file	Dermot Haughey	2015-05-27	2	-16/+66
* \| \| \| \| \| \| \| \|	:bomb: Fix another leftover	Rafael Mendonça França	2015-05-27	1	-1/+1
* \| \| \| \| \| \| \| \|	Fix file name	Rafael Mendonça França	2015-05-27	1	-1/+1
* \| \| \| \| \| \| \| \|	Merge pull request #19808 from byroot/action-parameter	Rafael Mendonça França	2015-05-27	2	-15/+32
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Allow to parameters named `action` or `controller` from AC::TestCase helpers	Jean Boussier	2015-04-18	2	-15/+32
* \| \| \| \| \| \| \| \| \|	Merge pull request #19867 from radar/rename-app-rails-loader	Rafael Mendonça França	2015-05-27	4	-14/+14
\|\ \ \ \ \ \ \ \ \ \