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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \|	Do not re-save destroyed association on saving parent object	Paul Nikitochkin	2013-07-15	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #11450
* \| \| \|	Merge pull request #11282 from ↵	Yves Senn	2013-07-15	3	-29/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	arunagw/deprecation-removed-attribute-missing-activerecord Remove deprecated `attribute_missing`.
\| * \| \| \|	Remove deprecation warning from attribute_missing	Arun Agrawal	2013-07-15	3	-29/+4
\| \|/ / / \| \| \| \| \| \| \| \|	for attributes that are columns.
* \| \| \|	Merge pull request #11448 from arunagw/updated_middleware_test	Yves Senn	2013-07-15	1	-1/+3
\|\ \ \ \ \| \|/ / / \|/\| \| \|	No need to add config for x_sendfile_header
\| * \| \|	Added CheckPending middleware in default	Arun Agrawal	2013-07-15	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As this middleware comes by default in a new rails app Added test to check omit for CheckPending when Active Record is not included.
\| * \| \|	No need to add config for x_sendfile_header	Arun Agrawal	2013-07-15	1	-2/+0
\|/ / / \| \| \| \| \| \| \| \| \|	Rack::Sendfile is loaded by default now
* \| \|	Rack::Sendfile is now included in middleware by default, change tests to ↵	Guillermo Iguaran	2013-07-15	1	-10/+4
\| \| \| \| \| \| \| \| \| \| \| \|	reflect that
* \| \|	Revert "Don't use Rack::Sendfile middleware if x_sendfile_header is not present"	Santiago Pastorino	2013-07-15	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 19ac034bdc9be175eff7cf54208ba14b43d97681. And allows webservers to configure X-Sendfile-Type. Closes #11440 thanks to [@MSch] Conflicts: railties/lib/rails/application.rb
* \| \|	Merge pull request #11434 from jetthoughts/new_save_transaction_bugfix	Santiago Pastorino	2013-07-14	3	-3/+23
\|\ \ \ \| \| \| \| \| \| \| \|	Remove extra decrement of transaction level
\| * \| \|	#4566: Remove extra decrement of transaction level	Paul Nikitochkin	2013-07-14	3	-3/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`rollback_active_record_state!` tries to restore model state on `Exception` by invoking `restore_transaction_record_state` it decrement deep level by `1`. After restoring it ensure that states to be cleared and level decremented by invoking `clear_transaction_record_state`, which cause the bug: because state already reduced in `restore_transaction_record_state`. Removed double derement of transaction level and removed duplicated code which clear transaction state for top level.
* \| \| \|	Merge pull request #11439 from ernie/only-scan-strings-for-nodes	Yves Senn	2013-07-14	2	-1/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Blacklist->whitelist for reference scans in order!
\| * \| \| \|	Blacklist->whitelist for reference scans in order!	Ernie Miller	2013-07-14	2	-1/+8
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop special-casing Arel::Nodes as exempt from reference scanning in order. Instead, only scan order values that are strings for a table reference.
* \| \| \|	re-introduce `select_for_count` private method.	Yves Senn	2013-07-14	1	-5/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://github.com/rails/rails/commit/da9b5d4a8435b744fcf278fffd6d7f1e36d4a4f2#commitcomment-3630064 for discussion.
* \| \| \|	Merge pull request #11437 from kennyj/fix_11393	Guillermo Iguaran	2013-07-14	3	-1/+11
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Fix #11393. Fix default rendered format when calling render method without :content_type option.
\| * \| \|	Fix default rendered format problem when calling render method without ↵	kennyj	2013-07-15	3	-1/+11
\|/ / / \| \| \| \| \| \| \| \| \|	:content_type option. Closes #11393.
* \| \|	Merge pull request #11433 from arunagw/removed_unused_task	José Valim	2013-07-14	1	-13/+0
\|\ \ \ \| \| \| \| \| \| \| \|	railties Rakefile tweaks
\| * \| \|	Removed unused require from Rakefile	Arun Agrawal	2013-07-14	1	-4/+0
\| \| \| \|
\| * \| \|	Removed unused broken task for update README [ci skip]	Arun Agrawal	2013-07-14	1	-9/+0
\|/ / /
* \| \|	Merge pull request #11425 from arunagw/actionview_api_generation	Xavier Noria	2013-07-14	1	-8/+7
\|\ \ \ \| \| \| \| \| \| \| \|	Actionview api generation
\| * \| \|	Added actionview in API generation [ci skip]	Arun Agrawal	2013-07-14	1	-8/+7
\| \| \| \| \| \| \| \| \| \| \| \|	CHANGELOG and LICENSE removed as suggested
* \| \| \|	Merge pull request #11431 from ianfleeton/initialization_memoized_typo	Yves Senn	2013-07-14	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	memorized -> memoized typo fix [ci skip]
\| * \| \| \|	memorized -> memoized typo fix [ci skip]	Ian Fleeton	2013-07-14	1	-1/+1
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Reverts one line from 457b7ff9
* \| \| \|	Merge pull request #11424 from kennyj/fix_column_defaults_caching	Santiago Pastorino	2013-07-13	3	-0/+15
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Reset @column_defaults when assigning locking_column.
\| * \| \| \|	Reset @column_defaults when assigning .	kennyj	2013-07-14	3	-0/+15
\| \| \| \| \|
* \| \| \| \|	This is not needed anymore, before_initialize block can access config	Santiago Pastorino	2013-07-14	1	-1/+0
\| \| \| \| \|
* \| \| \| \|	Merge pull request #11428 from evangoer/minor_asset_pipeline_docfix	Guillermo Iguaran	2013-07-13	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update YUI Compressor link; tweak UglifyJS
\| * \| \| \| \|	[ci-skip] Update link, tweak UglifyJS	Evan Goer	2013-07-13	1	-2/+2
\|/ / / / /
* \| \| \| \|	Merge pull request #11426 from wangjohn/action_controller_live_docs	Santiago Pastorino	2013-07-13	1	-0/+86
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	ActionController::Live documentation in the guides.
\| * \| \| \| \|	ActionController::Live documentation in the guides.	wangjohn	2013-07-13	1	-0/+86
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I'm adding documentation to the action_controller_overview guide which should tell people how to stream arbitrary data.
* \| \| \| \|	Merge pull request #11427 from jmondo/patch-1	Santiago Pastorino	2013-07-13	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	it's xml, not json
\| * \| \| \|	it's xml, not json	John Gesimondo	2013-07-13	1	-1/+1
\|/ / / / \| \| \| \| \| \| \| \|	change docs for xml serializer to talk about xml
* \| \| \|	Merge pull request #11422 from arunagw/added_missing_actionview	Guillermo Iguaran	2013-07-13	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Added missing actionview in list for release
\| * \| \|	Added missing actionview in list for release	Arun Agrawal	2013-07-13	1	-1/+1
\|/ / /
* \| \|	Merge pull request #11421 from arunagw/actionpack_activerecord_remove	Guillermo Iguaran	2013-07-13	1	-91/+0
\|\ \ \ \| \| \| \| \| \| \| \|	Removed unused file! Moved to actionview
\| * \| \|	Removed unused file! Moved to actionview	Arun Agrawal	2013-07-13	1	-91/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed unused file as this has been moved to actionview
* \| \| \|	Merge pull request #11413 from envylabs/master	Yves Senn	2013-07-13	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Remove block argument from callback example. [ci skip]
\| * \| \| \|	Remove block argument from callback example.	Carlos Souza	2013-07-13	1	-2/+2
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Merge pull request #11420 from simi/remove_update_application_controller_task	Yves Senn	2013-07-13	2	-12/+6
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	Remove update:application_controller rake task.
\| * \| \|	Remove update:application_controller rake task.	Josef Šimánek	2013-07-13	2	-12/+6
\|/ / /
* \| \|	Merge pull request #11417 from arunagw/gem_source_index_no_required	Yves Senn	2013-07-13	1	-1/+0
\|\ \ \ \| \| \| \| \| \| \| \|	Removing Gem.source_index [ci skip]
\| * \| \|	Removing Gem.source_index [ci skip]	Arun Agrawal	2013-07-13	1	-1/+0
\| \|/ /
* \| \|	Merge pull request #11414 from ankit8898/typo	Yves Senn	2013-07-13	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|	Typo fix [skip ci]
\| * \|	Typo fix [skip ci]	Ankit Gupta	2013-07-12	1	-1/+1
\|/ /
* \|	add test-case to verify `error.path` when a helper was not found.	Yves Senn	2013-07-12	1	-0/+5
\| \| \| \| \| \| \| \| \| \|	This verifies the code added with: https://github.com/rails/rails/commit/99c9d18601539c7e7e87f26bb047add1f93072af
* \|	move `MissingHelperError` out of the `ClassMethods` module.	Yves Senn	2013-07-12	3	-16/+23
\| \|
* \|	Merge pull request #11401 from dpdawson/master	Yves Senn	2013-07-12	1	-2/+2
\|\ \ \| \| \| \| \| \|	Improved Active View Overview guide. [ci skip]
\| * \|	Improve Active View Overview guide. [ci skip]	Daniel Dawson	2013-07-12	1	-2/+2
\| \| \|
* \| \|	Documment config.log_formatter added on 51aeae91	Rafael Mendonça França	2013-07-11	1	-0/+2
\|/ / \| \| \| \| \| \|	[ci skip]
* \|	Merge pull request #11400 from dpdawson/master	Yves Senn	2013-07-11	1	-1/+1
\|\ \ \| \| \| \| \| \|	Fix a grammatical error/typo in Active Record Associations guide. [ci skip]
\| * \|	Fix a grammatical error/typo in Active Record Associations guide.	Daniel Dawson	2013-07-11	1	-1/+1
\|/ /