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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \|	Rewording	Oge Nnadi	2011-04-11	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	removed :nodoc: from ActionController::MimeResponds	Jo Liss	2011-04-10	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So we don't miss out on the nice documentation of the respond_to and respond_with instance methods. Also added :nodoc: to protected method.
\| * \| \| \|	fix example query	Vijay Dev	2011-04-06	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-04-06	2	-1/+17
\| \|\ \ \ \
\| \| * \ \ \	Merge branch 'master' of github.com:lifo/docrails	Ryan Bigg	2011-04-05	86	-244/+987
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of github.com:lifo/docrails: (57 commits) Made the defaults section a little more readable and more to the point, giving a overview of the possibilities. Added information about default values added .'s to headings in the initialization textile page s/ERb/ERB/g (part II) s/ERb/ERB/g Bump up erubis to 2.7.0 Implicit actions named not_implemented can be rendered Gem::Specification#has_rdoc= is deprecated since rubygems 1.7.0 default_executable is deprecated since rubygems 1.7.0 Trivial fix to HTTP Digest auth MD5 example Moved Turn activation/dependency to railties fix typo Direct logging of Active Record to STDOUT so it's shown inline with the results in the console [DHH] Add using Turn with natural language test case names if the library is available (which it will be in Rails 3.1) [DHH] require turn only for minitest Use Turn to format all Rails tests and enable the natural language case names Improve docs. pass respond_with options to controller render when using a template for api navigation only try to display an api template in responders if the request is a get or there are no errors when using respond_with with an invalid resource and custom options, the default response status and error messages should be returned ...
\| \| \| * \| \| \|	Made the defaults section a little more readable and more to the point, ↵	simply-phi	2011-04-04	1	-71/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	giving a overview of the possibilities.
\| \| \| * \| \| \|	Added information about default values	simply-phi	2011-04-04	1	-0/+81
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Correct documentation on url_for. It doesn't call to_s, but rather to_param	Ryan Bigg	2011-04-05	1	-1/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-04-04	85	-235/+964
\| \|\ \ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-03-31	10	-67/+85
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-03-29	35	-104/+331
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-03-27	1	-2/+2
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-03-27	115	-656/+2115
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	remove to from to to :)	Vijay Dev	2011-03-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	stop using deprecated methods in arel	Aaron Patterson	2011-04-11	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Change Object#either? to Object#among? -- thanks to @jamesarosen for the ↵	David Heinemeier Hansson	2011-04-12	38	-44/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	suggestion!
* \| \| \| \| \| \| \| \| \| \|	remove so many nested if statements	Aaron Patterson	2011-04-11	1	-9/+11
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	wrap the pg_get_serial_sequence function and reuse it for the default ↵	Aaron Patterson	2011-04-11	2	-2/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sequence name
* \| \| \| \| \| \| \| \| \| \|	cache table exists queries in prepared statement cache	Aaron Patterson	2011-04-11	1	-3/+6
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	only use the primary_key method, refactor schema and table name parsing	Aaron Patterson	2011-04-11	1	-13/+15
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	use prepared statements for primary key queries	Aaron Patterson	2011-04-11	1	-2/+15
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	last insert id can never be called, so remove that code path	Aaron Patterson	2011-04-11	1	-11/+3
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	we know the table and pk, so we can calculate a default sequence name	Aaron Patterson	2011-04-11	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	always look up pk and sequence unless both are provided	Aaron Patterson	2011-04-11	1	-6/+5
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	pg does not know the insert_id in advance, so super will never return true	Aaron Patterson	2011-04-11	1	-13/+10
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	updating the docco for ActiveRecord::Result	Aaron Patterson	2011-04-11	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	implement exec_query on mysql2 adapter	Aaron Patterson	2011-04-11	1	-2/+20
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	make sqlite insert_sql more consistent with other adapters	Aaron Patterson	2011-04-11	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	adding exec_insert for postgresql	Aaron Patterson	2011-04-11	3	-1/+43
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	fixing variable name in mysql test	Aaron Patterson	2011-04-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	properly name schema queries for the logger	Aaron Patterson	2011-04-11	1	-10/+10
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	adding mysql adapter test case	Aaron Patterson	2011-04-11	1	-0/+69
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	adding client_encoding method for discovering the encoding set for this ↵	Aaron Patterson	2011-04-11	1	-0/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	client, testing exec_insert on a string
* \| \| \| \| \| \| \| \| \| \|	properly name schema queries for logging	Aaron Patterson	2011-04-11	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	adding exec_insert to sqlite3	Aaron Patterson	2011-04-11	2	-0/+16
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	adding a case_sensitive_modifier for forcing comparisons to be case sensitive	Aaron Patterson	2011-04-11	4	-0/+15
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	only support pg >= 8.2, so no need to check	Aaron Patterson	2011-04-11	1	-7/+4
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Remove code duplication.	José Valim	2011-04-11	3	-20/+27
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	No need to rescue here. Invoking the wrong method in an object can happen ↵	José Valim	2011-04-11	6	-40/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	anywhere if you are not careful. In other words, test your shit.
* \| \| \| \| \| \| \| \| \| \|	Revert "Add :use_include option to allow user to explicitly use ↵	José Valim	2011-04-11	4	-37/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`Range#include?` method in Ruby 1.9" Use :with => range.to_a instead. This reverts commit f6540211b5b9133c9f93c11655a04d613c237e67.
* \| \| \| \| \| \| \| \| \| \|	Keep the same API semantics for update/delete as we had for XML (just return ↵	David Heinemeier Hansson	2011-04-11	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	200 OK, no body)
* \| \| \| \| \| \| \| \| \| \|	Cant use inclusion in commands/application.rb as the frameworks havent all ↵	David Heinemeier Hansson	2011-04-11	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	been required yet
* \| \| \| \| \| \| \| \| \| \|	pg should define insert_sql so that query cache actually works for inserts	Aaron Patterson	2011-04-10	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Fix failing test case on master	Prem Sichanugrist	2011-04-10	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It turned out that I overlook at some replacements ..
* \| \| \| \| \| \| \| \| \| \|	adding pg support notes to the changelog	Aaron Patterson	2011-04-10	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	community support for pg < 8.2 has ended, so we can drop support for those ↵	Aaron Patterson	2011-04-10	1	-62/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	versions
* \| \| \| \| \| \| \| \| \| \|	Refactored uniqueness validator to use Arel instead of hardcoded SQL	Brian Cardarella	2011-04-10	1	-26/+11
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Using Object#in? and Object#either? in various places	Prem Sichanugrist	2011-04-11	44	-52/+108
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There're a lot of places in Rails source code which make a lot of sense to switching to Object#in? or Object#either? instead of using [].include?.
* \| \| \| \| \| \| \| \| \| \|	Add support for Object#in? and Object#either? in Active Support [#6321 ↵	Prem Sichanugrist, Brian Morearty, John Reitano	2011-04-11	3	-0/+74
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	state:committed] This will allow you to check if an object is included in another object or the list of objects or not. This patch is derived from patch by Brian Morearty and John Reitano on Lighthouse ticket. I've rewrite it and make sure that we support both 'another object' and 'list of objects' version, as it surely be useful to support both.
* \| \| \| \| \| \| \| \| \| \|	Remove dead branch code that appeared back in a merge.	José Valim	2011-04-10	1	-6/+0
\| \| \| \| \| \| \| \| \| \| \|