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

	Commit message (Expand)	Author	Age	Files	Lines
...
\| * \| \| \| \|	[layout/rendering guide] remove redundant wording	Weston Platter	2013-04-03	1	-3/+1
\| * \| \| \| \|	fix broken format in ActionView::Helpers::NumberHelper [ci skip]	Francesco Rodriguez	2013-04-03	1	-0/+25
\| * \| \| \| \|	Fixed Typo	Prathamesh Sonpatki	2013-04-03	1	-1/+1
\| * \| \| \| \|	Changed rspec/model directory example to spec/models	Prathamesh Sonpatki	2013-04-03	1	-2/+2
\| * \| \| \| \|	Typos/grammar fixes	Jonathan Roes	2013-04-03	1	-3/+3
\| * \| \| \| \|	fix formatting typo, + should be `	Yves Senn	2013-04-03	1	-1/+1
\| * \| \| \| \|	add `(association)`_type to schema convetions in AR basics guide.	Yves Senn	2013-04-03	1	-0/+2
\| * \| \| \| \|	link the Active Record pattern to the EAA Catalog	Yves Senn	2013-04-03	1	-4/+5
\| * \| \| \| \|	remove trailing whitespace from AR Basics guide	Yves Senn	2013-04-03	1	-94/+94
\| * \| \| \| \|	remove broken links from reference section in debugging guide.	Yves Senn	2013-04-03	1	-3/+0
\| * \| \| \| \|	adjust config.ru tempalte used in the rails on rack guide	Yves Senn	2013-04-03	1	-4/+7
\| * \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Oliver Jakubiec	2013-04-02	310	-1667/+4334
\| \|\ \ \ \ \
\| \| * \| \| \| \|	mark relation mutator as :nodoc: [ci skip]	Francesco Rodriguez	2013-04-02	1	-2/+1
\| \| * \| \| \| \|	Merge pull request #131 from lazylester/master	Grayson Wright	2013-04-02	1	-1/+1
\| \| \|\ \ \ \ \
\| \| \| * \| \| \| \|	as of Rails 3.2.13 it appears that importing an engine's migration into the h...	Les Nightingill	2013-03-31	1	-1/+1
\| \| * \| \| \| \| \|	Proofreading tweaks to the Mailer guide	Jonathan Roes	2013-04-01	1	-15/+15
\| \| * \| \| \| \| \|	Merge pull request #129 from rafBM/master	Vijay Dev	2013-04-01	1	-2/+2
\| \| \|\ \ \ \ \ \
\| \| \| * \| \| \| \| \|	Remove “Sweepers” from Caching TOC and mention Page/Action caching are re...	Rafaël Blais Masson	2013-03-24	1	-2/+2
\| \| * \| \| \| \| \| \|	Merge pull request #132 from hlee/master	Ken	2013-03-31	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	fixed a article link at sitepoint	Ken Lu	2013-03-31	1	-1/+1
\| \| \|/ / / / / /
\| \| * \| \| \| \| \|	Remove unnecessary / confusing code in example	Jonathan Roes	2013-03-31	1	-11/+2
\| \| * \| \| \| \| \|	Fix typo	Carson McDonald	2013-03-31	1	-1/+1
\| \| * \| \| \| \| \|	minor copy editing	Neeraj Singh	2013-03-30	3	-4/+9
\| \| * \| \| \| \| \|	Merge branch 'master' of github.com:rails/rails	Vijay Dev	2013-03-30	306	-1613/+4285
\| \| \|\ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Revert "Using American English spellings over British style spellings"	Vijay Dev	2013-03-30	2	-5/+5
\| * \| \| \| \| \| \| \|	Added a section on Rails Controller naming conventions.	Oliver Jakubiec	2013-04-02	1	-2/+12
* \| \| \| \| \| \| \| \|	Revert "added details to section 4.1.2 of the Asset Pipeline guide, describin...	Vijay Dev	2013-04-11	1	-29/+1
* \| \| \| \| \| \| \| \|	Merge pull request #10175 from vipulnsward/initialize_fix	Rafael Mendonça França	2013-04-11	1	-0/+1
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	initialize instead of assert to fix warning	Vipul A M	2013-04-11	1	-0/+1
* \| \| \| \| \| \| \| \| \|	Switched to new naming conventions	Noemj	2013-04-11	2	-4/+4
\| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #10177 from yahonda/test_relation_merging_with_merged_join...	Carlos Antonio da Silva	2013-04-11	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Address ORA-00979: not a GROUP BY expression error	Yasuo Honda	2013-04-11	1	-1/+1
* \| \| \| \| \| \| \| \|	fixes app_rails_loader_test.rb in Mac OS X	Xavier Noria	2013-04-11	1	-1/+12
* \| \| \| \| \| \| \| \|	Merge pull request #10174 from vipulnsward/cleanup_caching_test	Carlos Antonio da Silva	2013-04-11	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	cleanup statement cache test	Vipul A M	2013-04-11	1	-4/+4
\| \|/ / / / / / /
* / / / / / / /	fixes remaining lowercase "rails"	Xavier Noria	2013-04-11	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| /	application loader refactor and test suite complete rewrite	Xavier Noria	2013-04-11	2	-58/+71
\| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
* \| \| \| \| \|	Remove warning	Carlos Antonio da Silva	2013-04-10	1	-2/+2
* \| \| \| \| \|	Merge pull request #10170 from rubys/editorial_pass_over_generated_gemfile	Carlos Antonio da Silva	2013-04-10	2	-7/+11
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Editorial pass over generated Gemfile	Sam Ruby	2013-04-10	2	-7/+11
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #10152 from Noemj/statement_cache	Rafael Mendonça França	2013-04-10	4	-0/+108
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Added statement cache	Noemj	2013-04-10	4	-0/+108
* \| \| \| \| \| \|	Merge pull request #10168 from neerajdotname/simple_improvements	Rafael Mendonça França	2013-04-10	3	-5/+39
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	converge three lines into one	Neeraj Singh	2013-04-10	1	-3/+1
\| * \| \| \| \| \| \|	rdoc for some of the methods in JoinDependency	Neeraj Singh	2013-04-10	2	-0/+36
\| * \| \| \| \| \| \|	remove_duplicate_results! should be protected	Neeraj Singh	2013-04-10	1	-2/+2
* \| \| \| \| \| \| \|	Revert "Merge pull request #6226 from gnufied/master"	Rafael Mendonça França	2013-04-10	2	-34/+6
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #10164 from neerajdotname/3002-final	Rafael Mendonça França	2013-04-10	4	-4/+78
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	While merging relations preserve context for joins	Jared Armstrong and Neeraj Singh	2013-04-10	4	-4/+78
* \| \| \| \| \| \| \|	Revert "Merge pull request #10158 from steveklabnik/issue_10125"	Rafael Mendonça França	2013-04-10	2	-19/+2