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

	Commit message (Expand)	Author	Age	Files	Lines
*	Fix reset_counters() crashing on has_many :through associations.	lulalala	2012-10-02	5	-4/+28
*	Add the CHANGELOG entry that Guillermo forgot :P	Santiago Pastorino	2012-10-02	1	-0/+5
*	Merge pull request #7794 from guilleiguaran/extract-rack-cache	Santiago Pastorino	2012-10-01	5	-1/+16
\|\
\| *	Add rack-cache to default Gemfile	Guillermo Iguaran	2012-10-01	2	-0/+9
\| *	Use Rack::Cache middleware only if is in Gemfile	Guillermo Iguaran	2012-10-01	3	-1/+7
* \|	Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_variables	Rafael Mendonça França	2012-10-01	3	-23/+29
\|\ \
\| * \|	prefix TemplateAssertions ivars (#7459)	Yves Senn	2012-10-01	3	-23/+29
* \| \|	New CHANGELOG entries always in the top	Rafael Mendonça França	2012-10-01	1	-2/+2
\|/ /
* \|	Merge pull request #7789 from senny/7777_resource_functions_modify_options	Rafael Mendonça França	2012-10-01	3	-2/+27
\|\ \
\| * \|	resource and resources do no longer modify passed options	Yves Senn	2012-10-01	3	-2/+27
\|/ /
* \|	Merge pull request #7813 from arunagw/warning_fixed_as	Rafael Mendonça França	2012-10-01	1	-1/+1
\|\ \
\| * \|	warning fixed: (...) interpreted as grouped expression	Arun Agrawal	2012-10-01	1	-1/+1
\|/ /
* \|	Merge pull request #7812 from bdurand/optimize_cache_entry_take_2	Jeremy Kemper	2012-09-30	2	-3/+3
\|\ \
\| * \|	fix broken cache tests	Brian Durand	2012-09-30	2	-3/+3
\|/ /
* \|	Merge pull request #7811 from iHiD/resource_generator_routes_master	Santiago Pastorino	2012-09-30	1	-1/+1
\|\ \
\| * \|	Fix broken scaffold routes test	Jeremy Walker	2012-10-01	1	-1/+1
\|/ /
* \|	Merge pull request #7810 from steveklabnik/fix_build	Jeremy Kemper	2012-09-30	1	-0/+1
\|\ \
\| * \|	fix cache store test	Steve Klabnik	2012-09-30	1	-0/+1
\|/ /
* \|	Merge pull request #6450 from iHiD/resource_generator_routes_master	Rafael Mendonça França	2012-09-30	2	-6/+115
\|\ \
\| * \|	Fixed generated whitespace in routes when using namespaced resource.	Jeremy Walker	2012-09-29	2	-6/+115
* \| \|	Add a changelog entry for asset aliasing update in sprockets-rails. Supports ...	Jeremy Kemper	2012-09-30	1	-0/+14
* \| \|	Merge pull request #7808 from steveklabnik/fix_assertion_order	Xavier Noria	2012-09-30	1	-5/+5
\|\ \ \
\| * \| \|	Fix other assertions that were backwards.	Steve Klabnik	2012-09-30	1	-5/+5
\|/ / /
* \| \|	Merge pull request #7805 from steveklabnik/fix_assertion_order	Xavier Noria	2012-09-30	1	-2/+2
\|\ \ \
\| * \| \|	fix order of assertions.	Steve Klabnik	2012-09-30	1	-2/+2
\|/ / /
* \| \|	Merge pull request #7800 from bdurand/optimize_cache_entry_take_2	Xavier Noria	2012-09-30	4	-101/+141
\|\ \ \
\| * \| \|	Optimize ActiveSupport::Cache::Entry to reduce memory and processing overhead.	Brian Durand	2012-09-30	4	-101/+141
\|/ / /
* \| \|	Merge pull request #7795 from guilleiguaran/fix-ap-changelog	Vijay Dev	2012-09-30	1	-3/+2
\|\ \ \
\| * \| \|	Fix changelog entry about sprockets-rails	Guillermo Iguaran	2012-09-30	1	-3/+2
\|/ / /
* \| \|	Merge pull request #7791 from acapilleri/build_association	Rafael Mendonça França	2012-09-29	1	-5/+3
\|\ \ \
\| * \| \|	small refactoring of build_relation in uniqueness	Angelo Capilleri	2012-09-29	1	-5/+3
\| \| \|/ \| \|/\|
* \| \|	Whitespaces :scissors: [ci skip]	Rafael Mendonça França	2012-09-30	2	-11/+14
* \| \|	Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased	Rafael Mendonça França	2012-09-29	4	-5/+51
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	`assert_template` no more passing with what ever string that matches.	Hugo Roque	2012-09-29	4	-5/+51
\|/ /
* \|	Merge pull request #7784 from morgoth/proper_test_names_for_assertions	Rafael Mendonça França	2012-09-28	1	-2/+2
\|\ \ \| \|/ \|/\|
\| *	Changed test names to match proper context	Wojciech Wnętrzak	2012-09-28	1	-2/+2
* \|	Merge pull request #7787 from sferik/update_minitest	Jeremy Kemper	2012-09-28	1	-1/+1
\|\ \
\| * \|	Update minitest dependency to ~> 4.0	Erik Michaels-Ober	2012-09-28	1	-1/+1
\|/ /
* \|	Merge pull request #7783 from guilleiguaran/namespace-assets-cache-store	Santiago Pastorino	2012-09-28	3	-3/+6
\|\ \
\| * \|	Assets cache shouldn't be shared between different environments	Guillermo Iguaran	2012-09-28	3	-3/+6
* \| \|	Merge pull request #7782 from yahonda/case_insensitive_test_for_partial_inserts	Rafael Mendonça França	2012-09-28	1	-1/+1
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Change query pattern case insensitive	Yasuo Honda	2012-09-29	1	-1/+1
\|/ /
* /	Fix syntax error in the command_line guide [ci skip]	Rafael Mendonça França	2012-09-28	1	-2/+2
\|/
*	Fix syntax error with no US-ASCII char	Rafael Mendonça França	2012-09-28	1	-1/+1
*	revise commandline guide [ci skip]	Vijay Dev	2012-09-28	1	-12/+6
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-09-28	36	-373/+365
\|\
\| *	copy editing [ci skip]	Vijay Dev	2012-09-28	1	-1/+1
\| *	Revert "add documentation to generated routes"	Vijay Dev	2012-09-28	2	-4/+2
\| *	Improve documentation for subscribe block	Grant Hutchins & Sabrina Staedt	2012-09-27	1	-1/+11
\| *	Add #update_columns entry in Rails 4.0 release notes [ci skip]	Sebastian Martinez	2012-09-27	1	-0/+8