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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Grouped the ruby-prof into test.	Arun Agrawal	2011-05-05	1	-1/+4
\|
*	Removing from duplicate places. Only in Ruby platform needed.	Arun Agrawal	2011-05-05	1	-2/+1
\|
*	adding ruby-prof gem for ruby platform only #jruby	Vishnu Atrai	2011-05-05	1	-5/+1
\|
*	Merge pull request #397 from dchelimsky/view-path-decorator	José Valim	2011-05-05	0	-0/+0
\|\ \| \| \| \|	rename test case to better describe use case
\| *	rename test case to better describe use case	David Chelimsky	2011-04-23	1	-6/+6
\| \|
* \|	Merge pull request #394 from splattael/fix_rake_routes_shows_custom_assets	José Valim	2011-05-05	2	-1/+10
\|\ \ \| \| \| \| \| \|	Display custom asset routes in `rake routes`
\| * \|	Display custom asset routes in `rake routes`	Peter Suschlik	2011-05-05	2	-1/+10
\| \| \|
* \| \|	Merge pull request #392 from janx/master	José Valim	2011-05-05	3	-43/+117
\|\ \ \ \| \| \| \| \| \| \| \|	Patch for performance test: make it run with ruby19/minitest
\| * \| \|	add tests for performance test	Jan Xie	2011-05-05	2	-0/+29
\| \| \| \|
\| * \| \|	minitest/ruby19 compatible performance test	Jan Xie	2011-05-05	1	-43/+88
\| \|/ /
* / /	Update respond_with docs to deal better with collections.	José Valim	2011-05-05	1	-1/+6
\|/ /
* \|	Merge pull request #390 from arunagw/jruby_openssl	José Valim	2011-05-05	2	-0/+2
\|\ \ \| \| \| \| \| \|	Adding jruby-openssl in Gemfile by default. #jruby
\| * \|	Adding jruby-openssl in Gemfile by default. #jruby	Arun Agrawal	2011-05-05	2	-0/+2
\| \| \|
* \| \|	Merge pull request #391 from bradleypriest/patch-1	José Valim	2011-05-05	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|	Tidying up the language in wrap_parameters.rb
\| * \|	Tidying up the language in wrap_parameters.rb	Bradley Priest	2011-05-04	1	-1/+1
\| \| \|
* \| \|	No longer need to reference mysql2 from git	David Heinemeier Hansson	2011-05-04	1	-9/+1
\|/ /
* \|	Prepare for beta1	David Heinemeier Hansson	2011-05-04	9	-9/+9
\| \|
* \|	Only show dump of regular env methods on exception screen (not all the rack ↵	David Heinemeier Hansson	2011-05-04	3	-5/+8
\| \| \| \| \| \| \| \|	crap) [DHH]
* \|	Dont show the assets mount in rake routes	David Heinemeier Hansson	2011-05-04	1	-1/+2
\| \|
* \|	ensure query cache is cleared when Rack body is closed, fixes bug reported ↵	Aaron Patterson	2011-05-04	2	-0/+12
\| \| \| \| \| \| \| \|	on 951e18abea9c116fc5d6b330ca1dcd2890abe006
* \|	Bump up rack-cache, tzinfo and thor	Santiago Pastorino	2011-05-04	3	-4/+4
\| \|
* \|	Merge branch 'master' of github.com:rails/rails	Xavier Noria	2011-05-04	2	-3/+4
\|\ \
\| * \	Merge pull request #387 from smartinez87/remove_method.	José Valim	2011-05-04	2	-3/+4
\| \|\ \ \| \| \| \| \| \| \| \|	Use #remove_possible_method instead
\| \| * \|	Use #remove_possible_method instead here	Sebastian Martinez	2011-05-04	1	-2/+3
\| \| \| \|
\| \| * \|	Use #remove_possible_method instead	Sebastian Martinez	2011-05-04	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2011-05-04	2	-35/+35
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	commented meta code	Vijay Dev	2011-05-04	1	-11/+11
\| \| \| \|
\| * \| \|	formatting results in comments	Vijay Dev	2011-05-04	2	-24/+24
\| \| \| \|
* \| \| \|	Fix renew feature on cookies.	José Valim	2011-05-04	2	-1/+17
\| \| \| \|
* \| \| \|	Fix .subdomain regression.	José Valim	2011-05-04	2	-1/+10
\| \|/ / \|/\| \|
* \| \|	Use remove possible method here.	José Valim	2011-05-04	1	-1/+2
\| \| \|
* \| \|	Relax this dependency a bit.	José Valim	2011-05-04	1	-1/+1
\| \| \|
* \| \|	Let's run those precious tests against the gem.	José Valim	2011-05-04	1	-2/+0
\| \| \|
* \| \|	Move sandbox to AR and pass the sandbox as a value. This way, other ORMs ↵	José Valim	2011-05-04	5	-7/+21
\| \| \| \| \| \| \| \| \| \| \| \|	like Datamapper can also have their own sandboxing in rails console.
* \| \|	Remove defined?(ActiveRecord) and use the railtie hook instead.	José Valim	2011-05-04	2	-7/+4
\|/ /
* \|	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2011-05-04	12	-97/+82
\|\ \
\| * \|	Remove extra whitespaces	Sebastian Martinez	2011-05-03	1	-9/+9
\| \| \|
\| * \|	Improves Mysql2 adapter docs	Sebastian Martinez	2011-05-03	1	-0/+6
\| \| \|
\| * \|	Added #recreate_database docs	Sebastian Martinez	2011-05-03	1	-0/+2
\| \| \|
\| * \|	Fixes on schema_definitions docs	Sebastian Martinez	2011-05-03	1	-3/+3
\| \| \|
\| * \|	Fix typo in Factory Girl description	backspace	2011-05-03	1	-1/+1
\| \| \|
\| * \|	fixed-fonts on SchemaDefinitions	Sebastian Martinez	2011-05-02	1	-3/+3
\| \| \|
\| * \|	Remove extra whitespaces	Sebastian Martinez	2011-05-02	1	-18/+18
\| \| \|
\| * \|	removed reference to verify method	Vijay Dev	2011-05-02	1	-9/+1
\| \| \|
\| * \|	removed verify docs (feature removed in Rails3)	Vijay Dev	2011-05-02	1	-39/+0
\| \| \|
\| * \|	Update security guide with #new and #create respect mass-assignment	Sebastian Martinez	2011-05-02	1	-2/+14
\| \| \|
\| * \|	Added some docs on ActiveResource::HttpMock	Sebastian Martinez	2011-05-01	1	-0/+4
\| \| \|
\| * \|	Documented ActiveResource#observing	Sebastian Martinez	2011-05-01	1	-0/+8
\| \| \|
\| * \|	Remove extra whitespaces.	Sebastian Martinez	2011-05-01	1	-5/+5
\| \| \|
\| * \|	Fix punctuation errors.	Sebastian Martinez	2011-05-01	1	-5/+5
\| \| \|