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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2011-05-25	16	-154/+167
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb
\| *	Typo; changed 'Febuary' to 'February'	Lee Reilly	2011-05-25	1	-1/+1
\| \|
\| *	Typo; changed 'colour' to 'color' & 'analysed' to 'analyzed'	Lee Reilly	2011-05-25	1	-3/+3
\| \|
\| *	Typo; changed 'enviroment' to 'environment'	Lee Reilly	2011-05-25	1	-1/+1
\| \|
\| *	prefer validates :x in place of validates_x_of	Vijay Dev	2011-05-26	1	-25/+25
\| \|
\| *	fixed minor errors	Vijay Dev	2011-05-26	1	-3/+4
\| \|
\| *	changes validates_format & numericality to newer syntax	Vijay Dev	2011-05-25	1	-6/+6
\| \|
\| *	changes validates_inclusion & exclusion to newer syntax	Vijay Dev	2011-05-25	1	-7/+7
\| \|
\| *	changes validates_length_of to newer syntax	Vijay Dev	2011-05-25	1	-17/+14
\| \|
\| *	changes validates_confirmation_of to newer syntax	Vijay Dev	2011-05-25	1	-4/+4
\| \|
\| *	changes validates_acceptance_of to newer syntax	Vijay Dev	2011-05-25	1	-2/+2
\| \|
\| *	changes validates_uniqueness_of to newer syntax	Vijay Dev	2011-05-25	1	-4/+4
\| \|
\| *	changes validates_presence_of to newer syntax	Vijay Dev	2011-05-25	1	-9/+8
\| \|
\| *	fix incorrect textile syntax	Vijay Dev	2011-05-25	1	-2/+2
\| \|
\| *	update language env variable name	Vijay Dev	2011-05-25	1	-2/+2
\| \|
\| *	Adds outline draft#1 for the Asset Pipeline, please comment if you have ↵	Mohammad El-Abid	2011-05-25	1	-0/+29
\| \| \| \| \| \| \| \|	thoughts about it!
\| *	Removed extra white-spaces on config/environment/test.rb template	Guillermo Iguaran	2011-05-23	1	-2/+2
\| \|
\| *	Removing extra white-spaces on config/environment/development.rb template	Guillermo Iguaran	2011-05-23	1	-1/+1
\| \|
\| *	Fix styling error on plugins guide.	Sebastian Martinez	2011-05-23	1	-1/+1
\| \|
\| *	NOTE: doesn't handle newlines.	Matthew McEachen	2011-05-23	1	-3/+1
\| \|
\| *	removed require_library_or_gem from the AS core extensions guide	Josh Kalderimis	2011-05-23	1	-14/+0
\| \|
\| *	Minor typo describing engine helpers	Matthew Daubert	2011-05-22	1	-2/+2
\| \|
\| *	Following proper naming conventions while referring to Rails, Bundler	Matthew McEachen	2011-05-22	1	-4/+4
\| \|
\| *	Removed the `enginex` plugin reference which is broken -- rails 3.1.0.beta1 ↵	Matthew McEachen	2011-05-21	1	-16/+19
\| \| \| \| \| \| \| \|	has that functionality now.
\| *	Remove extra white spaces on guides.	Sebastian Martinez	2011-05-21	4	-26/+26
\| \|
\| *	Remove extra white spaces.	Sebastian Martinez	2011-05-21	1	-2/+2
\| \|
\| *	Remove duplicate words.	Uģis Ozols	2011-05-20	1	-1/+1
\| \|
\| *	Changin 'for' with 'each' on FormHelpers guide	Guillermo Iguaran	2011-05-19	1	-1/+1
\| \|
\| *	Using each instead of for in actionview guide	Guillermo Iguaran	2011-05-19	1	-1/+1
\| \|
\| *	Replacing 'for' with 'each' in actionmailer guide	Guillermo Iguaran	2011-05-19	1	-1/+1
\| \|
* \|	Merge pull request #1305 from amatsuda/require_rdoc_task_fail2	José Valim	2011-05-25	4	-11/+6
\|\ \ \| \| \| \| \| \|	Ensure RDoc::Task exists even if 'rdoc/task' was not required
\| * \|	Ensure RDoc::Task exists even if 'rdoc/task' was not required	Akira Matsuda	2011-05-26	4	-11/+6
\| \| \|
* \| \|	Merge pull request #1308 from vijaydev/fix-codestat-indent	José Valim	2011-05-25	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Minor indentation fix in code_statistics
\| * \| \|	fix indentation	Vijay Dev	2011-05-25	1	-1/+1
\| \|/ /
* / /	Renaming helper in the Rake task, but why is this needed in the first place? ↵	wycats	2011-05-25	1	-1/+1
\|/ / \| \| \| \| \| \|	(paging JP)
* \|	Merge pull request #1301 from amatsuda/require_rdoc_task_fail	Xavier Noria	2011-05-25	4	-5/+21
\|\ \ \| \| \| \| \| \|	require 'rake/rdoctask' if failed to require 'rdoc/task'
\| * \|	require 'rake/rdoctask' if failed to require 'rdoc/task'	Akira Matsuda	2011-05-26	4	-5/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes a regression introduced by b921679d0dd3d5ca16f0362c2b34e7703cfe15e5 require 'rdoc/task' fails if the system RDoc version is below 2.4.2 (e.g. CRuby 1.8.7)
* \| \|	Improve test assertion	Stefan Sprenger	2011-05-25	1	-1/+3
\| \| \|
* \| \|	Remove whitespaces from empty line	Stefan Sprenger	2011-05-25	1	-1/+1
\| \| \|
* \| \|	Add test files to engine's gemspec	Stefan Sprenger	2011-05-25	2	-0/+10
\|/ /
* \|	Merge pull request #1260 from flippingbits/master	José Valim	2011-05-25	2	-1/+5
\|\ \ \| \| \| \| \| \|	Remove shebang from the template
\| * \|	Add test for shebang in engine's script/rails file	Stefan Sprenger	2011-05-24	1	-0/+5
\| \| \|
\| * \|	Merge branch 'master' of https://github.com/rails/rails	Stefan Sprenger	2011-05-24	1	-1/+2
\| \|\ \
\| * \| \|	Remove shebang from the template since it's already added by the	Stefan Sprenger	2011-05-24	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	generator
* \| \| \|	fix Rails::Paths::Root document	Jan Xie	2011-05-25	1	-4/+3
\| \| \| \|
* \| \| \|	Using load_generators	Arun Agrawal	2011-05-25	1	-1/+1
\| \| \| \|
* \| \| \|	Use load_generators instead.	José Valim	2011-05-25	1	-4/+2
\| \| \| \|
* \| \| \|	Merge pull request #1288 from guilleiguaran/railties-deprecations	José Valim	2011-05-25	15	-287/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Remove Railties deprecated methods
\| * \| \| \|	Removing deprecated config.generators in Rails::Railtie	Guillermo Iguaran	2011-05-25	1	-5/+0
\| \| \| \| \|
\| * \| \| \|	Remove deprecated plugin generator	Guillermo Iguaran	2011-05-24	11	-202/+0
\| \| \| \| \|