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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #14171 from arthurnn/extract_middleware_cache	Guillermo Iguaran	2014-02-23	2	-32/+41
\|\
\| *	Extract local cache middleware	Arthur Neves	2014-02-23	2	-32/+41
* \|	Group assets options in production env template	Carlos Antonio da Silva	2014-02-23	1	-6/+4
* \|	Introduce Concern#class_methods and Kernel#concern	Jeremy Kemper	2014-02-23	7	-18/+113
\|/
*	Merge pull request #13793 from senny/postgres/dynamic_range_oid	Yves Senn	2014-02-23	4	-63/+147
\|\
\| *	deprecate support for pg ranges with excluding beginnings.	Yves Senn	2014-02-23	3	-23/+78
\| *	dynamically define PostgreSQL OID range types.	Yves Senn	2014-02-23	4	-52/+81
* \|	update version to 4.2.0.alpha	Yves Senn	2014-02-23	9	-11/+11
\|/
*	Add tests for default scope behaviour change	Jon Leighton	2014-02-23	2	-0/+20
*	Merge pull request #13515 from kuldeepaggarwal/f-model-generation	Godfrey Chan	2014-02-22	5	-12/+40
\|\
\| *	Add warning when user tried to create model with pluralize name.	Kuldeep Aggarwal	2014-02-23	5	-12/+40
* \|	Merge pull request #14164 from vajrasky/fix_typo_max_id	Guillermo Iguaran	2014-02-22	1	-1/+1
\|\ \
\| * \|	Fixed typo in comment about MAX_ID.	Vajrasky Kok	2014-02-23	1	-1/+1
* \| \|	Distinguish ConnectionNotEstablished messages: no conn pool for the class, or...	Jeremy Kemper	2014-02-22	1	-1/+4
* \| \|	Merge pull request #14140 from WojtekKruszewski/optimize_foreign_key_for	Carlos Antonio da Silva	2014-02-21	1	-1/+1
\|\ \ \
\| * \| \|	Prevent foreign_key_for? from type casting all attributes	Wojtek Kruszewski	2014-02-21	1	-1/+1
* \| \| \|	Revert "Only lookup `config.log_level` for stdlib `::Logger`. Closes #11665."	Guillermo Iguaran	2014-02-21	3	-26/+2
\|/ / /
* \| /	releasing Rails no longer needs triggering docs generation by hand [ci skip]	Xavier Noria	2014-02-20	2	-37/+0
\| \|/ \|/\|
* \|	Merge pull request #14131 from kuldeepaggarwal/upgrade-rails-version	Arthur Nogueira Neves	2014-02-20	1	-2/+2
\|\ \
\| * \|	[ci skip] update guides to new version of rails 3.2.x	Kuldeep Aggarwal	2014-02-21	1	-2/+2
\|/ /
* \|	adding a test for #14106	Aaron Patterson	2014-02-20	1	-0/+25
* \|	Revert "context in validation goes through has many relationship"	Aaron Patterson	2014-02-20	4	-27/+1
* \|	Merge pull request #14129 from joankaradimov/fix-render-to-string	Carlos Antonio da Silva	2014-02-20	1	-1/+3
\|\ \
\| * \|	Check if the `request` variable isn't nil when calling render_to_string	Joan Karadimov	2014-02-20	1	-1/+3
* \| \|	Merge pull request #14086 from jingweno/master	Arthur Nogueira Neves	2014-02-20	1	-1/+1
\|\ \ \
\| * \| \|	[skip ci] Fix the javascript path in guide for asset modules	Jingwen Owen Ou	2014-02-20	1	-1/+1
* \| \| \|	Merge pull request #14124 from arthurnn/fix_14116	Aaron Patterson	2014-02-20	2	-5/+8
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	Add regression test for collection proxy reader	Arthur Neves	2014-02-20	1	-0/+7
\| * \| \|	Revert "speed up the collection proxy reader method, but slow down the constr...	Arthur Neves	2014-02-20	1	-5/+1
* \| \| \|	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2014-02-20	1	-0/+7
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Add tip about using RDoc's --pipe command to quickly test the output of	Zachary Scott	2014-02-10	1	-0/+7
* \| \| \|	Merge pull request #14120 from gregmolnar/guides	Carlos Antonio da Silva	2014-02-20	1	-3/+3
\|\ \ \ \
\| * \| \| \|	change 'assert !' to 'assert_not' in guides [ci skip]	Greg Molnar	2014-02-20	1	-3/+3
\|/ / / /
* \| \| \|	Pointing to latest guides [ci skip]	Arun Agrawal	2014-02-19	1	-1/+1
* \| \| \|	Merge pull request #14102 from arthurnn/quietly_doc	Xavier Noria	2014-02-19	1	-0/+4
\|\ \ \ \
\| * \| \| \|	Methods silence_stream/quietly are not thread-safe [skip ci]	Arthur Neves	2014-02-19	1	-0/+4
* \| \| \| \|	Merge pull request #14107 from prakashmurthy/patch-1	Arun Agrawal	2014-02-19	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	[ci skip] Close the meta tag with '/>' instead of '>'	Prakash Murthy	2014-02-19	1	-1/+1
\|/ / / / /
* \| \| \| \|	Fix render plain docs example in AM::Base	Guillermo Iguaran	2014-02-18	1	-2/+2
* \| \| \| \|	Merge pull request #14099 from robertomiranda/render-text-2-plain	Guillermo Iguaran	2014-02-18	4	-11/+11
\|\ \ \ \ \
\| * \| \| \| \|	Update Docs in favor to use render plain instead of text option	robertomiranda	2014-02-18	4	-11/+11
\|/ / / / /
* \| \| \| \|	Merge pull request #14098 from Amit-Thawait/master	Arthur Nogueira Neves	2014-02-18	2	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	Typo fix for unscope	Amit Thawait	2014-02-18	2	-2/+2
\|/ / / / /
* \| \| \| \|	Use the reference for the mime type to get the format	Rafael Mendonça França	2014-02-18	4	-2/+36
* \| \| \| \|	Merge branch '4-1-0-beta2'	Rafael Mendonça França	2014-02-18	15	-15/+83
\|\ \ \ \ \
\| * \| \| \| \|	Preparing for 4.1.0.beta2 release	Rafael Mendonça França	2014-02-18	11	-9/+17
\| * \| \| \| \|	Correctly escape PostgreSQL arrays.	Aaron Patterson	2014-02-18	2	-1/+13
\| * \| \| \| \|	Escape format, negative_format and units options of number helpers	Rafael Mendonça França	2014-02-18	2	-5/+53
* \| \| \| \| \|	Merge pull request #14097 from chancancode/sync_4_1_release_notes	Godfrey Chan	2014-02-18	1	-3/+11
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Sync 4.1 release notes with changes since 7f648bc7 [ci skip]	Godfrey Chan	2014-02-18	1	-3/+11
\|/ / / / / /