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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #7975 from butcher/extend_date_select_helper_functionality	Rafael Mendonça França	2012-10-18	3	-0/+24
\|\
\| *	Extend date_select helper functionality.	Pavel Nikitin	2012-10-18	3	-0/+22
* \|	Remove warning setting eager_load	Rafael Mendonça França	2012-10-18	1	-0/+1
* \|	Don't use action_controller.perform_caching to enable rack-rack.	Rafael Mendonça França	2012-10-18	3	-7/+14
* \|	Fix the app_generator and plugin_new tests	Rafael Mendonça França	2012-10-18	2	-1/+4
* \|	Merge pull request #7990 from mrbrdo/master	Rafael Mendonça França	2012-10-18	1	-1/+1
\|\ \
\| * \|	add credit to committer of pull request #6569	Jan Berdajs	2012-10-18	1	-1/+1
\|/ /
* \|	Merge pull request #7969 from senny/active_model_validations_requires_necessa...	Rafael Mendonça França	2012-10-18	1	-5/+6
\|\ \
\| * \|	active_model/validations requires necessary files to run	Yves Senn	2012-10-18	1	-0/+1
\| * \|	cleanup, replace non-breaking spaces with spaces	Yves Senn	2012-10-18	1	-5/+5
\|/ /
* \|	Now the Sprockets railtie lives in sprockets/railtie	Rafael Mendonça França	2012-10-18	4	-4/+4
* \|	Permit string and float values in the multiparameter attributes	Rafael Mendonça França	2012-10-18	2	-10/+15
* \|	Typecast to string and array are not supported in multiparameter	Rafael Mendonça França	2012-10-18	1	-3/+2
* \|	Change back to official sprockets-rails	Joshua Peek	2012-10-17	2	-3/+3
* \|	Add changelog entry for precompile config	Joshua Peek	2012-10-17	1	-0/+4
* \|	Merge pull request #7968 from josh/only-precompile-app-assets-by-default	Rafael Mendonça França	2012-10-17	1	-1/+1
\|\ \
\| * \|	Only compile non-js/css under app/assets by default	Joshua Peek	2012-10-16	1	-1/+1
* \| \|	Merge pull request #7964 from josh/josh-sprockets-rails	Rafael Mendonça França	2012-10-17	7	-136/+61
\|\ \ \
\| * \| \|	Switch to new sprockets-rails plugin	Joshua Peek	2012-10-15	7	-136/+61
\| \|/ /
* \| \|	Add more CHANGELOG entries from #7927	Rafael Mendonça França	2012-10-17	2	-2/+5
* \| \|	Add CHANGELOG entry for #7927	Rafael Mendonça França	2012-10-17	3	-11/+9
* \| \|	remove unused variables. Oops!	Aaron Patterson	2012-10-17	1	-2/+2
* \| \|	use columns hash to look up the column for the count field	Aaron Patterson	2012-10-17	2	-14/+7
* \| \|	fix Digestor to be thread safe.	Aaron Patterson	2012-10-17	1	-8/+30
* \| \|	use the tmp filesystem rather than our own thing.	Aaron Patterson	2012-10-17	1	-5/+9
* \| \|	Merge pull request #7972 from scottwillson/fix-double-presence-of-errors-2	José Valim	2012-10-17	3	-2/+16
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Fix bug with presence validation of associations.	Scott Willson	2012-10-16	3	-2/+16
\|/ /
* \|	Merge pull request #7371 from csmuc/fix_dup_validation_errors	Santiago Pastorino	2012-10-16	3	-0/+20
\|\ \
\| * \|	Call super to nullify the reference to the original errors object in the dup'...	Christian Seiler	2012-10-16	3	-0/+20
* \| \|	Merge pull request #7963 from arunagw/redcarpet_not_for_jruby	Carlos Antonio da Silva	2012-10-16	1	-1/+1
\|\ \ \
\| * \| \|	redcarpet gem will not work with JRuby!	Arun Agrawal	2012-10-16	1	-1/+1
* \| \| \|	Revert "remove unnecessary object/conversions file"	Xavier Noria	2012-10-16	4	-2/+11
* \| \| \|	Merge pull request #7958 from mattdbridges/rails-guides-active-support-addition	Santiago Pastorino	2012-10-15	1	-0/+4
\|\ \ \ \
\| * \| \| \|	Adding reference a few Time and Date aliases	Matt Bridges	2012-10-15	1	-0/+4
\|/ / / /
* \| \| \|	Move changelog entry from #7439 to the top [ci skip]	Carlos Antonio da Silva	2012-10-15	1	-6/+6
* \| \| \|	Merge pull request #7439 from featurist/master	Aaron Patterson	2012-10-15	3	-1/+10
\|\ \ \ \
\| * \| \| \|	ActiveRecord: sum expression returns string '0' for no records, fixed	Tim Macfarlane	2012-10-15	3	-1/+10
\|/ / / /
* \| \| /	use `setup` for setting up the test	Aaron Patterson	2012-10-15	1	-5/+1
\| \|_\|/ \|/\| \|
* \| \|	Merge pull request #7956 from josh/ignore-asset-url-query-or-anchor	Rafael Mendonça França	2012-10-15	2	-2/+21
\|\ \ \
\| * \| \|	Ignore asset url query string or anchor when appending extensions and computi...	Joshua Peek	2012-10-15	2	-2/+21
* \| \| \|	buckets hash isn't public, so use symbol keys to avoid string	Aaron Patterson	2012-10-15	1	-8/+8
* \| \| \|	Move two hotspots to use Hash[] rather than Hash#dup	Aaron Patterson	2012-10-15	1	-3/+5
\|/ / /
* \| \|	Merge pull request #7927 from josh/asset-path-helper	Rafael Mendonça França	2012-10-15	11	-505/+289
\|\ \ \
\| * \| \|	Use sprockets-rails master	Joshua Peek	2012-10-15	2	-3/+3
\| * \| \|	Extract compute_asset_extname and allow extname to be disabled	Joshua Peek	2012-10-15	2	-13/+30
\| * \| \|	Sprockets-rails branch	Joshua Peek	2012-10-15	1	-1/+1
\| * \| \|	Use sprockets-rails branch for now	Joshua Peek	2012-10-15	1	-2/+2
\| * \| \|	Merge branch 'master' into asset-path-helper	Joshua Peek	2012-10-15	123	-626/+681
\| \|\ \ \ \| \|/ / / \|/\| \| \|
* \| \| \|	ruby-prof isn't compatible with ruby trunk after 36925	Jeremy Kemper	2012-10-15	1	-2/+2
* \| \| \|	Merge pull request #7953 from kryzhovnik/sanitize_helper_cleanup	Santiago Pastorino	2012-10-15	1	-4/+0
\|\ \ \ \