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

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \| \| \| \|	Revert "Merge pull request #12085 from valk/master"	Santiago Pastorino	2013-09-03	1	-3/+1
* \| \| \| \| \|	Merge pull request #12121 from strzalek/move-methods-to-abs-controller	Rafael Mendonça França	2013-09-03	4	-62/+49
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Move BasicRendering to AbstractController	Łukasz Strzałkowski	2013-09-03	3	-29/+29
\| * \| \| \| \| \|	Make Mime::TEXT default format in AbstractController	Łukasz Strzałkowski	2013-09-03	2	-4/+1
\| * \| \| \| \| \|	Move skeleton methods from AV to AbsC	Łukasz Strzałkowski	2013-09-03	2	-29/+19
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #12110 from strzalek/revert-default-protected-instance-vars	Rafael Mendonça França	2013-09-02	6	-25/+20
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Return to using protected_instance_variables in AV	Łukasz Strzałkowski	2013-09-02	2	-9/+6
\| * \| \| \| \| \|	Revert "Port all remaining self.protected_instance_variables to class methods"	Łukasz Strzałkowski	2013-09-02	5	-21/+19
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #12105 from rajcybage/fixing_typo	Yves Senn	2013-09-02	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
\| * \| \| \| \|	fix the typo [ci skip]	Rajarshi Das	2013-09-02	1	-1/+1
* \| \| \| \| \|	Remove useless comment and white spaces :scissors: [ci skip]	Carlos Antonio da Silva	2013-09-01	2	-3/+2
* \| \| \| \| \|	Reuse variable to avoid symbol usage	Carlos Antonio da Silva	2013-08-31	1	-2/+2
* \| \| \| \| \|	Merge pull request #12097 from kassio/remove-unused-delegate-on-railtie	José Valim	2013-08-31	1	-2/+0
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Remove unused delegate	Kassio Borges	2013-08-31	1	-2/+0
* \| \| \| \| \| \|	Merge pull request #11912 from jonkessler/respond-to-signature-fixes	Rafael Mendonça França	2013-08-31	4	-2/+14
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	update Rails::Railtie::Configuration and ActionDispatch::Response#respond_to?...	Jon Kessler	2013-08-16	4	-2/+14
* \| \| \| \| \| \| \|	clear all connections before forking	Aaron Patterson	2013-08-31	1	-0/+3
\| \|/ / / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Revert "Do not dup the binds when visiting the AST"	Rafael Mendonça França + Kassio Borges	2013-08-31	3	-10/+3
* \| \| \| \| \| \|	Don't need to check if the scope respond to call	Rafael Mendonça França + Kassio Borges	2013-08-31	3	-7/+3
* \| \| \| \| \| \|	Revert "reconnect after the fork returns"	Rafael Mendonça França	2013-08-31	1	-2/+0
* \| \| \| \| \| \|	Do not dup the binds when visiting the AST	Rafael Mendonça França	2013-08-31	3	-3/+10
* \| \| \| \| \| \|	Merge pull request #12095 from kassio/upgrade-jruby-gems	Rafael Mendonça França	2013-08-31	1	-6/+6
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	upgrade jruby dependencies	Kassio Borges	2013-08-31	1	-6/+6
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #12091 from rywall/pluck-optimization	José Valim	2013-08-31	1	-2/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Don't use Enumerable#next in pluck since it is very slow	Ryan Wallace	2013-08-30	1	-2/+1
* \| \| \| \| \| \|	Merge pull request #12093 from wangjohn/indentation_in_generator	José Valim	2013-08-31	1	-3/+3
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Using indent method to refactor controller generator.	wangjohn	2013-08-31	1	-3/+3
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #12090 from njakobsen/merger-performance	Aaron Patterson	2013-08-30	1	-3/+3
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Don't create fibers just to iterate	Nicholas Jakobsen	2013-08-30	1	-3/+3
* \| \| \| \| \| \|	reconnect after the fork returns	Aaron Patterson	2013-08-30	1	-0/+2
* \| \| \| \| \| \|	reduce relation allocations	Aaron Patterson	2013-08-30	1	-1/+3
* \| \| \| \| \| \|	remove unused variable	Aaron Patterson	2013-08-30	1	-1/+1
* \| \| \| \| \| \|	no need to fully qualify	Aaron Patterson	2013-08-30	1	-1/+1
* \| \| \| \| \| \|	move the cache to the AR models and populate it on inherited	Aaron Patterson	2013-08-30	3	-24/+50
* \| \| \| \| \| \|	add a failing test for marshal + cache problems	Aaron Patterson	2013-08-30	1	-0/+26
* \| \| \| \| \| \|	no need for the const_get since we lock	Aaron Patterson	2013-08-30	1	-5/+1
* \| \| \| \| \| \|	require a class for cache computations	Aaron Patterson	2013-08-30	2	-2/+4
* \| \| \| \| \| \|	cache misses should return self	Aaron Patterson	2013-08-30	1	-1/+1
* \| \| \| \| \| \|	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2013-08-31	4	-12/+18
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Fix typos [ci skip]	Carlos Antonio da Silva	2013-08-30	1	-2/+2
\| * \| \| \| \| \|	Add documentation for rake db:setup task	Jay Hayes	2013-08-29	1	-0/+5
\| * \| \| \| \| \|	Note functional equivalence in reset task	Jay Hayes	2013-08-29	1	-2/+2
\| * \| \| \| \| \|	Fix doc for singularize - `pluralized` => `singularized`	Vipul A M	2013-08-27	1	-1/+1
\| * \| \| \| \| \|	Document ability to run a single test.	wangjohn	2013-08-21	1	-1/+8
\| * \| \| \| \| \|	Removing merge conflict remnants in the guides.	wangjohn	2013-08-21	1	-6/+0
\| * \| \| \| \| \|	Moved "`mod_expires` to be enabled" to new line.	Prathamesh Sonpatki	2013-08-21	1	-2/+2
* \| \| \| \| \| \|	Merge pull request #12085 from valk/master	Santiago Pastorino	2013-08-30	1	-1/+3
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	FIX reload! within rails console --sandbox causes undefined method rollback u...	Val Kotlarov Hoffman	2013-08-30	1	-1/+3
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* / \| \| \| \| \|	add missing fixtures file	Aaron Patterson	2013-08-30	1	-1/+2
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #12078 from prathamesh-sonpatki/typo	Guillermo Iguaran	2013-08-29	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|