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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \| \| \|	Merge pull request #4250 from lest/range-json	Xavier Noria	2012-01-02	2	-0/+8
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use #to_s to convert Range to json
\| * \| \| \| \| \| \| \| \| \|	use #to_s to convert Range to json	Sergey Nartimov	2012-01-01	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #4266 from lest/deprecate-activesupport-base64	José Valim	2012-01-02	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix base64 require
\| * \| \| \| \| \| \| \| \| \| \|	fix base64 require	Sergey Nartimov	2012-01-03	1	-1/+1
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #4252 from lest/deprecate-activesupport-base64	José Valim	2012-01-02	12	-63/+35
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	remove ActiveSupport::Base64 in favor of ::Base64
\| * \| \| \| \| \| \| \| \| \|	remove ActiveSupport::Base64 in favor of ::Base64	Sergey Nartimov	2012-01-02	12	-63/+35
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #4253 from lest/remove-warnings	José Valim	2012-01-02	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix use of FormBuilder.field_helpers
\| * \| \| \| \| \| \| \| \| \|	fix use of FormBuilder.field_helpers	Sergey Nartimov	2012-01-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	it is array of symbols now
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #4263 from bogdan/local_gemfile	José Valim	2012-01-02	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed path to local gemfile.
\| * \| \| \| \| \| \| \| \| \| \|	Fixed path to local gemfile.	Bogdan Gusiev	2012-01-02	1	-1/+2
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #4251 from castlerock/rename_ruby_debug_to_ruby_debug19	José Valim	2012-01-01	4	-6/+6
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	rename ruby-debug to ruby-debug19
\| * \| \| \| \| \| \| \| \| \|	rename ruby-debug to ruby-debug19	Vishnu Atrai	2012-01-01	4	-6/+6
\| \|/ / / / / / / / /
* / / / / / / / / /	fix a warning about grouped expressions	Vijay Dev	2012-01-01	1	-1/+1
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #4248 from andrew/2012	Vijay Dev	2011-12-31	15	-15/+15
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated copyright notices for 2012
\| * \| \| \| \| \| \| \| \|	Updated copyright notices for 2012	Andrew Nesbitt	2011-12-31	15	-15/+15
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	DRY up guides index page	Vijay Dev	2011-12-31	3	-48/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the list of guides available in documents.yaml to fill in the menu in the index page instead of duplicating the list again. Also, remove WIP guides from the menu.
* \| \| \| \| \| \| \| \| \|	Merge pull request #4242 from castlerock/remove_condition_for_MiniTest	Santiago Pastorino	2011-12-31	1	-9/+3
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \|	MiniTest condition removed
\| * \| \| \| \| \| \| \| \|	MiniTest condition removed	Vishnu Atrai	2011-12-31	1	-9/+3
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-12-31	3	-20/+18
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	remove wiki link	Vijay Dev	2011-12-31	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	fix a couple of formatting issues	Vijay Dev	2011-12-31	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Minor readability improvements	Sam Umbach	2011-12-30	1	-13/+13
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	SCSS processor is provided by the sass gem	Sam Umbach	2011-12-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fixed documentation error in code examples from form_tag_helper.rb	Alejandro Andrés	2011-12-30	1	-2/+2
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	removes comment obsoleted by 18ed37b	Xavier Noria	2011-12-31	1	-3/+0
\| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #4241 from castlerock/remove_more_conditions_for_Fiber_ruby19	José Valim	2011-12-30	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \|	remove more conditions for Fiber in ruby19
\| * \| \| \| \| \| \| \|	remove more conditions for Fiber available in ruby19	Vishnu Atrai	2011-12-31	2	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #4237 from castlerock/fiber_available_in_ruby19	Aaron Patterson	2011-12-30	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fiber is available in ruby19 condition removed
\| * \| \| \| \| \| \| \| \|	fiber is available in ruby19	Vishnu Atrai	2011-12-31	1	-1/+1
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	updating the reaping frequency documentation	Aaron Patterson	2011-12-30	1	-0/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	rename start to run and use Thread.pass rather than sleeping to schedule the ↵	Aaron Patterson	2011-12-30	2	-23/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	watchdog
* \| \| \| \| \| \| \| \|	connection pool starts the reaper	Aaron Patterson	2011-12-30	2	-0/+17
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	just dup the spec now that it will deep copy	Aaron Patterson	2011-12-30	1	-2/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	connection specification will deep copy the config	Aaron Patterson	2011-12-30	2	-0/+16
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	each connection pool has a reaper	Aaron Patterson	2011-12-30	3	-2/+18
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	introduce a timer class for reaping connections	Aaron Patterson	2011-12-30	2	-0/+65
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	raise a pull full error when the connection pool is full and no connection ↵	Aaron Patterson	2011-12-30	2	-18/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	can be obtained
* \| \| \| \| \| \| \| \|	connections are only removed if they are inactve	Aaron Patterson	2011-12-30	2	-3/+19
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	connections can be reaped via the `reap` method	Aaron Patterson	2011-12-30	2	-0/+27
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	deal with removing connections associated with the current thread	Aaron Patterson	2011-12-30	2	-0/+15
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	connections can be removed from the pool	Aaron Patterson	2011-12-30	2	-1/+28
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	queue and signal no longer needed	Aaron Patterson	2011-12-30	1	-2/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	refactor checking out the connection	Aaron Patterson	2011-12-30	1	-5/+6
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	infinite loop is no longer necessary	Aaron Patterson	2011-12-30	1	-20/+11
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	connections must be checked in at the end of a thread	Aaron Patterson	2011-12-30	3	-31/+7
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #4235 from castlerock/remove_ruby_18_BasicObject	José Valim	2011-12-30	1	-1/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ruby 1.8 ActiveSupport BasicObject no longer available
\| * \| \| \| \| \| \| \|	ruby 1.8 ActiveSupport BasicObject no longer available	Vishnu Atrai	2011-12-30	1	-1/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #4236 from castlerock/to_time_available_in_ruby19_DateTime	José Valim	2011-12-30	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	remove condition since to_time always available in ruby19 DateTime
\| * \| \| \| \| \| \| \|	remove condition since to_time always available in ruby19 DateTime	Vishnu Atrai	2011-12-31	1	-1/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	be explicit about where helpers are installed	Aaron Patterson	2011-12-30	2	-2/+2
\| \| \| \| \| \| \| \|