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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #1996 from bogdan/default_sanitizer_squashed	José Valim	2011-07-07	2	-0/+6
\|\
\| *	Rails app template: setup different mass assignment sanitizer for envs	Bogdan Gusiev	2011-07-07	2	-0/+6
* \|	Merge pull request #1406 from dmathieu/fix_test_warnings	José Valim	2011-07-07	1	-2/+1
\|\ \
\| * \|	remove the warning when testing whiny_nil	dmathieu	2011-07-07	1	-2/+1
* \| \|	Merge pull request #1120 from lysenko/collection_singular_ids	Santiago Pastorino	2011-07-06	2	-1/+6
\|\ \ \
\| * \| \|	Fix bug in collection_singular_ids on has many through association with condi...	Anatoliy Lysenko	2011-07-06	2	-1/+6
* \| \| \|	Merge pull request #1989 from simonbaird/master	Santiago Pastorino	2011-07-06	1	-5/+8
\|\ \ \ \
\| * \| \| \|	Fix charset/collate in mysql recreate_database	Simon Baird	2011-07-07	1	-5/+8
* \| \| \| \|	Ensure the engine_path is there (it may make CI happy).	José Valim	2011-07-06	1	-1/+1
* \| \| \| \|	Give higher priority to assets.cache_store.	José Valim	2011-07-06	1	-1/+1
* \| \| \| \|	Make compressors lazily load.	José Valim	2011-07-06	4	-3/+40
* \| \| \| \|	Don't construct association scope in initializer. This yields a big performan...	Jon Leighton	2011-07-07	2	-7/+11
* \| \| \| \|	Remove stream at the class level.	José Valim	2011-07-06	2	-39/+6
* \| \| \| \|	Merge pull request #1987 from ernie/fix_fix_to_reverse_sql_order	Jon Leighton	2011-07-06	1	-1/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Remove case statement changes from 2e0840d and 56ac32a. Inheritance FTW.	Ernie Miller	2011-07-06	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #1273 from jeremyf/feature-association-proxy-send	Santiago Pastorino	2011-07-06	3	-1/+11
\|\ \ \ \
\| * \| \| \|	Addresses an inconsistency in the ActiveRecord::Base.method_missing handling ...	Jeremy Friesen	2011-05-24	3	-1/+11
* \| \| \| \|	Merge pull request #1463 from psanford/master	Santiago Pastorino	2011-07-06	2	-2/+3
\|\ \ \ \ \
\| * \| \| \| \|	Make String.to_time respect timezones	Nate Mueller	2011-06-02	2	-2/+3
* \| \| \| \| \|	Merge pull request #1494 from anildigital/master	Santiago Pastorino	2011-07-06	1	-2/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix failing test because of Timezone difference.	Anil Wadghule	2011-06-05	1	-2/+2
* \| \| \| \| \| \|	Merge pull request #1926 from tobsch/master	Santiago Pastorino	2011-07-06	2	-5/+8
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Now accepting css/js files in deeper directory structures by default.	Tobias Schlottke	2011-07-01	2	-5/+8
* \| \| \| \| \| \| \|	Merge pull request #1979 from bogdan/association_sum_array_compatibility	Jon Leighton	2011-07-06	2	-2/+10
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Fixed AR::Relation#sum compatibility with Array#sum	Bogdan Gusiev	2011-07-05	2	-2/+10
* \| \| \| \| \| \| \| \|	updating pg supported versions docco. fixes #1959	Aaron Patterson	2011-07-05	3	-3/+3
* \| \| \| \| \| \| \| \|	Merge pull request #1968 from bogdan/associations_find_array_compatibility2	Santiago Pastorino	2011-07-05	2	-3/+11
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Fixed CollectionAssociation#find to be compatible with Array#find	Bogdan Gusiev	2011-07-05	2	-3/+11
* \| \| \| \| \| \| \| \| \|	Merge pull request #1963 from jake3030/fix_engine_rake_task	José Valim	2011-07-05	2	-0/+10
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	fix engines rake tasks	Jake Varghese	2011-07-04	2	-0/+10
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2011-07-05	14	-99/+370
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	minor edit in 7896ac3	Vijay Dev	2011-07-05	1	-1/+1
\| * \| \| \| \| \| \| \| \| \|	Edited railties/guides/source/asset_pipeline.textile via GitHub	Mohammad Typaldos	2011-07-03	1	-3/+3
\| * \| \| \| \| \| \| \| \| \|	document meta methods	Vijay Dev	2011-07-03	1	-8/+8
\| * \| \| \| \| \| \| \| \| \|	[asset pipeline] expand section on configuration	Richard Hulse	2011-07-03	1	-10/+19
\| * \| \| \| \| \| \| \| \| \|	[asset pipeline] More updates	Richard Hulse	2011-07-03	1	-9/+13
\| * \| \| \| \| \| \| \| \| \|	[asset pipeline] Add resources to fingerprinting	Richard Hulse	2011-07-03	1	-3/+2
\| * \| \| \| \| \| \| \| \| \|	[asset pipeline] what is fingerprinting section	Richard Hulse	2011-07-03	1	-6/+13
\| * \| \| \| \| \| \| \| \| \|	[asset pipeline] spelling !	Richard Hulse	2011-07-03	1	-3/+3
\| * \| \| \| \| \| \| \| \| \|	[asset pipeline] Add new rationale section	Richard Hulse	2011-07-03	1	-1/+31
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #50 from wader/master	Vijay Dev	2011-07-02	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	Fix arguments to get plugin help. Otherwise a plugin named "new" is created.	Mattias Wadman	2011-07-01	1	-1/+1
\| * \| \| \| \| \| \| \| \| \| \|	document handle_unverified_request method	Vijay Dev	2011-07-02	1	-0/+2
\| * \| \| \| \| \| \| \| \| \| \|	Revert "fix a typo"	Vijay Dev	2011-07-02	1	-1/+1
\| * \| \| \| \| \| \| \| \| \| \|	fix a typo	Ray Baxter	2011-07-01	1	-1/+1
\| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	general grammar cleanup of cache docs	Matt Jankowski	2011-07-01	1	-24/+26
\| * \| \| \| \| \| \| \| \| \|	general formatting cleanup, and clarify that passing true as third option for...	Matt Jankowski	2011-07-01	1	-11/+11
\| * \| \| \| \| \| \| \| \| \|	[asset pipeline] refactor docs and add new content	Richard Hulse	2011-07-01	1	-25/+162
\| * \| \| \| \| \| \| \| \| \|	update doc about resetting the session in case of authenticity token mismatch	Vijay Dev	2011-07-01	1	-6/+5
\| * \| \| \| \| \| \| \| \| \|	Revert "Included w3c_validators gem and modified Migrations file"	Vijay Dev	2011-06-30	2	-28/+12