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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove deprecation from AS::Deprecation behavior, some minor cleanups	Carlos Antonio da Silva	2012-03-16	9	-71/+36
\| \| \| \| \| \| \| \| \|	* Refactor log subscriber, use select! to avoid a new object * Remove deprecation messages related to AS::Deprecation behavior This was added about 2 years ago for Rails 3: https://github.com/rails/rails/commit/d4c7d3fd94e5a885a6366eaeb3b908bb58ffd4db * Remove some not used requires * Refactor delegate to avoid string conversions and if statements inside each block
*	Merge pull request #5465 from sandeepravi/warning_fixes	José Valim	2012-03-16	1	-1/+1
\|\ \| \| \| \|	fixed - warning: assigned but unused variable - checker
\| *	fixed - warning: assigned but unused variable - checker	Sandeep	2012-03-16	1	-1/+1
\|/
*	Merge pull request #5365 from avakhov/ac-layouts-excpetion-msgs	Piotr Sarnacki	2012-03-16	1	-2/+2
\|\ \| \| \| \|	Fix exceptions messages in AC layouts
\| *	Fix exceptions messages in AC layouts	Alexey Vakhov	2012-03-10	1	-2/+2
\| \|
* \|	Merge pull request #5461 from yakko/master	José Valim	2012-03-16	1	-0/+4
\|\ \ \| \| \| \| \| \|	relation .present? and .blank? should not query SELECT COUNT(DISTINCT id)
\| * \|	relation .present? and .blank? should not query SELECT COUNT(DISTINCT id)	Thiago Almeida	2012-03-16	1	-0/+4
\| \| \|
* \| \|	Merge pull request #5327 from kennyj/fix_explicitly_inheraitance_column	Aaron Patterson	2012-03-15	2	-1/+12
\|\ \ \ \| \|/ / \|/\| \|	Don't reset inheritance_column when setting explicitly.
\| * \|	Don't reset inheritance_column when setting explicitly.	kennyj	2012-03-08	2	-1/+12
\| \| \|
* \| \|	Merge pull request #5454 from luke-gru/luke-dev	Piotr Sarnacki	2012-03-15	2	-4/+44
\|\ \ \ \| \| \| \| \| \| \| \|	allow zero-arity proc for AbstrController::layout
\| * \| \|	allow zero-arity proc for AbstrController::layout	Luke Gruber	2012-03-15	2	-4/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	proc without parameters can now be given to AbstractController::layout
* \| \| \|	Merge pull request #5457 from brianmario/typo-fix	Aaron Patterson	2012-03-15	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix typo in redirect test
\| * \| \| \|	fix typo in redirect test	Brian Lopez	2012-03-15	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #5456 from brianmario/redirect-sanitization	Aaron Patterson	2012-03-15	3	-2/+22
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Strip null bytes from Location header
\| * \| \|	strip null bytes from Location header as well	Brian Lopez	2012-03-15	3	-2/+22
\|/ / / \| \| \| \| \| \| \| \| \|	add tests for stripping \r\n chars since that's already happening
* \| \|	errors should probably be logged as errors	Aaron Patterson	2012-03-15	1	-20/+19
\| \| \|
* \| \|	Merge pull request #5451 from yahonda/address_hstores_failue	Aaron Patterson	2012-03-15	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Address the dump file format for hstore
\| * \| \|	Address the dump file format for hstore	Yasuo Honda	2012-03-15	1	-1/+1
\|/ / /
* \| \|	Revert "AM::MassAssingmentSecurity: improve performance"	José Valim	2012-03-15	2	-17/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It introduces backwards incompatible changes in the API. This reverts commit 7d1379ffdbbaf01e99833dc06611b7e4f3799522.
* \| \|	Merge pull request #5437 from kennyj/fix_5430	Aaron Patterson	2012-03-15	2	-1/+8
\|\ \ \ \| \| \| \| \| \| \| \|	Fix GH #5430. A Payload name for schema_search_path should be SCHEMA.
\| * \| \|	Fix GH #5430. A Payload name for schema_search_path should be SCHEMA.	kennyj	2012-03-15	2	-1/+8
\| \| \| \|
* \| \| \|	Merge pull request #5337 from mreinsch/static_invalid_byte_sequence	Aaron Patterson	2012-03-15	2	-0/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	fix ArgumentError being raised in case of invalid byte sequences
\| * \| \| \|	fix ArgumentError being raised in case of invalid byte sequences	Michael Reinsch	2012-03-08	2	-0/+5
\| \| \| \| \|
* \| \| \| \|	Merge pull request #5448 from JonRowe/patch_file_update_on_master	José Valim	2012-03-15	2	-1/+20
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Commas in directory names causes hang in ActiveSupport::FileUpdateChecker
\| * \| \| \| \|	escape commas in paths before globbing to avoid infinite hang in Dir[]	Jon Rowe	2012-03-15	2	-1/+20
\|/ / / / /
* \| \| \| \|	Simplify helpers handling. Ensure Metal can run AC hooks.	José Valim	2012-03-15	6	-37/+65
\| \| \| \| \|
* \| \| \| \|	Remove ActionController::TestCase#rescue_action_in_public!	Piotr Sarnacki	2012-03-15	2	-10/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This method has no effect since exception handling was moved to middlewares and ActionController tests do not use any middlewares.
* \| \| \| \|	Allow you to force the authenticity_token to be rendered even on remote ↵	David Heinemeier Hansson	2012-03-14	2	-5/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	forms if you pass true
* \| \| \| \|	Do not include the authenticity token in forms where remote: true as ajax ↵	David Heinemeier Hansson	2012-03-14	3	-2/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	forms use the meta-tag value
* \| \| \| \|	Remove remaining http_only? calls.	José Valim	2012-03-14	2	-14/+4
\| \| \| \| \|
* \| \| \| \|	Remove --http.	José Valim	2012-03-14	30	-1020/+7
\| \| \| \| \|
* \| \| \| \|	Merge pull request #5357 from bagilevi/sweeper-undefined-method-ignored	Piotr Sarnacki	2012-03-14	2	-1/+17
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Don't ignore call to undefined method in Sweeper
\| * \| \| \| \|	Don't ignore call to undefined method in Sweeper	Levente Bagi	2012-03-06	2	-1/+17
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #5439 from carlosantoniodasilva/rake-test-scaffold	José Valim	2012-03-14	3	-5/+31
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|	Fix scaffold controller template and ensure rake test for scaffold works
\| * \| \| \| \|	Fix scaffold controller template, ensure rake scaffold test pass by default	Carlos Antonio da Silva	2012-03-14	3	-5/+31
\| \| \| \| \| \|
* \| \| \| \| \|	Add API apps CHANGELOG entry	Santiago Pastorino	2012-03-14	1	-0/+2
\|/ / / / /
* \| \| \| \|	Update railties/guides/source/api_app.textile	José Valim	2012-03-14	1	-2/+0
\| \| \| \| \|
* \| \| \| \|	Do not generate app/views and sprockets entries on http app	Carlos Antonio da Silva	2012-03-14	2	-1/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Carlos Antonio da Silva & Santiago Pastorino]
* \| \| \| \|	Generate special controller and functional test templates for http apps	Carlos Antonio da Silva	2012-03-14	10	-5/+181
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The main goal is to not generate the format.html block in scaffold controller, and to generate a different functional test as we don't rely on redirects anymore, we should test for http responses. In addition to that, the :edit action is removed from the http controller and the edit route is not generated by default, as they usually do not make sense in this scenario. [Carlos Antonio da Silva & Santiago Pastorino]
* \| \| \| \|	Rename http-only app generator option to http	Carlos Antonio da Silva	2012-03-14	4	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Carlos Antonio da Silva & Santiago Pastorino]
* \| \| \| \|	Move http only option to AppGenerator	Carlos Antonio da Silva	2012-03-14	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Carlos Antonio da Silva & Santiago Pastorino]
* \| \| \| \|	Add test to ensure setting config.generators.http_only actually disables the ↵	Carlos Antonio da Silva	2012-03-14	2	-2/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	generator options [Carlos Antonio da Silva & Santiago Pastorino]
* \| \| \| \|	Allow generator configs from http_only! to be overriden by app	Carlos Antonio da Silva	2012-03-14	2	-1/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Carlos Antonio da Silva & Santiago Pastorino]
* \| \| \| \|	Remove duplicated tests from shared generator	Carlos Antonio da Silva	2012-03-14	2	-16/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Carlos Antonio da Silva & Santiago Pastorino]
* \| \| \| \|	Refactor http_only, remove reader method	Carlos Antonio da Silva	2012-03-14	1	-14/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Carlos Antonio da Silva & Santiago Pastorino]
* \| \| \| \|	Disable template, helper and assets options when using http_only!	Carlos Antonio da Silva	2012-03-14	2	-1/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Carlos Antonio da Silva & Santiago Pastorino]
* \| \| \| \|	Create generators http_only! setup and hide some common namespaces for now	Carlos Antonio da Silva	2012-03-14	3	-4/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Carlos Antonio da Silva & Santiago Pastorino]
* \| \| \| \|	Generate middleware http_only! config when running http only app generator	Carlos Antonio da Silva	2012-03-14	2	-1/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Carlos Antonio da Silva & Santiago Pastorino]
* \| \| \| \|	Add http-only option to Rails app generator	Carlos Antonio da Silva	2012-03-14	4	-5/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change application controller template accordingly, to inherit from ActionController::HTTP and not generate protect_from_forgery call. [Carlos Antonio da Silva & Santiago Pastorino]
* \| \| \| \|	Add ActionController::HTTP	Santiago Pastorino	2012-03-14	17	-9/+383
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More info http://edgeguides.rubyonrails.org/api_app.html [Carlos Antonio da Silva & Santiago Pastorino]