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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2013-05-01	1	-0/+7
\|\
\| *	routes.rb should teach how to use concerns	Thiago Pinto	2013-05-01	1	-0/+7
\| *	Revert "Merge pull request #10194 from pabloh/extract_regexp_at_generators_te...	Carlos Antonio da Silva	2013-04-12	1	-3/+1
\| *	Merge pull request #10194 from pabloh/extract_regexp_at_generators_testing_as...	Carlos Antonio da Silva	2013-04-12	1	-1/+3
\| \|\
\| \| *	Extract method declaration regexp into a constant	Pablo Herrero	2013-04-12	1	-1/+3
* \| \|	Removing the app constant and replacing it with Rails.application	wangjohn	2013-04-30	9	-9/+9
* \| \|	Minor code duplication removed	Arun Agrawal	2013-04-29	1	-6/+6
* \| \|	ActiveRecord -> Active Record	Xavier Noria	2013-04-22	1	-1/+1
* \| \|	Merge branch 'master' of github.com:rails/rails	David Heinemeier Hansson	2013-04-19	1	-2/+2
\|\ \ \
\| * \| \|	Unindent attributes iteration in scaffold index template	Carlos Antonio da Silva	2013-04-18	1	-2/+2
* \| \| \|	Alignment	David Heinemeier Hansson	2013-04-18	1	-1/+1
\|/ / /
* \| \|	Indent around the scaffold loop	David Heinemeier Hansson	2013-04-18	1	-8/+8
* \| \|	HTML5 breaks	David Heinemeier Hansson	2013-04-18	2	-4/+4
* \| \|	Better ordering	David Heinemeier Hansson	2013-04-18	1	-3/+3
* \| \|	Use sass-rails 4.0.0.rc1	Rafael Mendonça França	2013-04-18	1	-1/+1
* \| \|	Use latest coffee-rails release	Rafael Mendonça França	2013-04-18	1	-1/+1
* \| \|	Revert "sprockets 2.9.x doesn't work with uglifier 2.0 yet."	Rafael Mendonça França	2013-04-18	1	-2/+2
* \| \|	Don't need to add activerecord-deprecated_finders on edge and dev	Rafael Mendonça França	2013-04-17	1	-3/+1
* \| \|	Use strip_heredoc where possible	Sam Ruby	2013-04-11	1	-14/+12
\|/ /
* /	Editorial pass over generated Gemfile	Sam Ruby	2013-04-10	2	-7/+11
\|/
*	sprockets 2.9.x doesn't work with uglifier 2.0 yet.	Rafael Mendonça França	2013-04-06	1	-2/+2
*	Merge branch 'master' into railstest	Aaron Patterson	2013-04-05	2	-11/+17
\|\
\| *	Model generator USAGE doc improved	Jason King	2013-04-04	1	-10/+16
\| *	add require to suppress warning; remove variable	Vipul A M	2013-04-04	1	-1/+1
* \|	apps that depend on active record should load fixtures	Aaron Patterson	2013-04-03	1	-3/+2
\|/
*	Avoid running bundler on tests that don't need it	Sam Ruby	2013-04-03	1	-1/+4
*	Getting rid of a few other vestiges of rails.png.	Steve Klabnik	2013-04-02	1	-1/+0
*	We don't need to remove index.html any more.	Steve Klabnik	2013-04-02	1	-1/+0
*	.gitkeep -> .keep	Steve Klabnik	2013-04-02	1	-0/+0
*	adding .gigkeep to default app/assets/images	Steve Klabnik	2013-04-02	1	-0/+0
*	Remove rails.png.	Steve Klabnik	2013-04-02	1	-0/+0
*	Revert "Use jquery-rails from github"	Santiago Pastorino	2013-04-02	1	-3/+1
*	Revert more Rails.version changes	Rafael Mendonça França	2013-04-01	3	-4/+4
*	Move the class methods to above the protected section	Rafael Mendonça França	2013-04-01	3	-47/+36
*	Merge pull request #10021 from pabloh/refactor_rails_generator_test_case	Rafael Mendonça França	2013-04-01	4	-211/+259
\|\
\| *	Break down Rails::Generator::TestCase into modules	Pablo Herrero	2013-03-31	4	-211/+259
* \|	Merge pull request #9978 from trevorturk/cookie-store-auto-upgrade	Santiago Pastorino	2013-04-01	1	-1/+1
\|\ \ \| \|/ \|/\|
\| *	Allow transparent upgrading of legacy signed cookies to encrypted cookies; Au...	Trevor Turk	2013-03-28	1	-1/+1
* \|	Make comment about uglifier in generated Gemfile consistent between branches	Carlos Antonio da Silva	2013-03-30	1	-1/+1
* \|	be lazy loading SDoc	Xavier Noria	2013-03-30	1	-1/+1
* \|	rdoc is no longer a gem dependency, sdoc becomes a runtime dependency	Xavier Noria	2013-03-30	1	-0/+5
* \|	Update the call to Bundler.require in application.rb since assets group doesn...	Guillermo Iguaran	2013-03-28	1	-2/+3
* \|	Add better comments to assets gems	Guillermo Iguaran	2013-03-28	1	-9/+22
\|/
*	Add coffee-rails and javascript runtime to gemfile if skip_javascript is	Rafael Mendonça França	2013-03-28	1	-2/+9
*	Remove buggy and unnecessary logic	Sam Ruby	2013-03-27	1	-7/+0
*	Cosmetic cleanup of generated Gemfile	Sam Ruby	2013-03-27	1	-17/+14
*	Put coffee-rails in top-level of generated Gemfile	Gabe Kopley	2013-03-24	1	-15/+27
*	Use jquery-rails from github	Sam Ruby	2013-03-24	1	-1/+3
*	Merge pull request #8501 from charliesome/version-to-s	Rafael Mendonça França	2013-03-23	3	-4/+4
\|\
\| *	remove references to ::VERSION, replace with .version	Charlie Somerville	2013-03-21	3	-4/+4