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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \|	Merge pull request #11434 from jetthoughts/new_save_transaction_bugfix	Santiago Pastorino	2013-07-14	1	-3/+3
\|\ \ \| \| \| \| \| \|	Remove extra decrement of transaction level
\| * \|	#4566: Remove extra decrement of transaction level	Paul Nikitochkin	2013-07-14	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`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	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Blacklist->whitelist for reference scans in order!
\| * \| \|	Blacklist->whitelist for reference scans in order!	Ernie Miller	2013-07-14	1	-1/+1
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \|	Reset @column_defaults when assigning .	kennyj	2013-07-14	1	-0/+1
\| \|
* \|	Typo fix [skip ci]	Ankit Gupta	2013-07-12	1	-1/+1
\|/
*	Avoid creating an extra Range instance	Akira Matsuda	2013-07-10	1	-1/+1
\|
*	fix visibility of the relation construction methods	Aaron Patterson	2013-07-09	1	-5/+7
\|
*	pass arel to select_all rather than depend on method_missing	Aaron Patterson	2013-07-09	1	-1/+1
\|
*	Fix: attribute_for_inspect truncate upto (51 => 50) characters.	namusyaka	2013-07-09	1	-2/+2
\|
*	Merge pull request #11174 from vipulnsward/remove_column_passing	Rafael Mendonça França	2013-07-09	1	-2/+2
\|\ \| \| \| \|	Stop sending column info to `substitute_at` as it doesn't get utilized.
\| *	Document where `column` param gets utilized in `substitute_at`.	Vipul A M	2013-07-01	1	-2/+2
\| \|
* \|	refactor to_sql so it does not depend on the to_sql implementation of	Aaron Patterson	2013-07-08	1	-4/+11
\| \| \| \| \| \| \| \|	the connection
* \|	Merge pull request #11306 from ↵	Rafael Mendonça França	2013-07-06	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	jetthoughts/11288_remove_extra_queries_for_belongs_to_with_touch #11288: Removed duplicated touching Conflicts: activerecord/CHANGELOG.md
\| * \|	#11288: Removed duplicated touching	Paul Nikitochkin	2013-07-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	if belongs to model with touch option on touch Closes #11288
* \| \|	Extract common query to a constant.	Vipul A M	2013-07-06	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Perf ref: https://gist.github.com/vipulnsward/8209749201dfdd678c97
* \| \|	Revert "Merge pull request #11299 from ↵	Yves Senn	2013-07-05	1	-0/+5
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	arunagw/disable_implicit_join_references_removed" `disable_implicit_join_references=` was only deprecated on `master`, not with rails 4.0. We can remove it after 4.1 This reverts commit 3c719ead414ffd29e71efce185698af979052abb, reversing changes made to d5c3bf9722abd5733a769c8d789de3f74dbfb92d.
* \|	Merge pull request #11299 from arunagw/disable_implicit_join_references_removed	Carlos Antonio da Silva	2013-07-04	1	-5/+0
\|\ \ \| \| \| \| \| \|	Remove deprecated `ActiveRecord::Base.disable_implicit_join_references=`
\| * \|	Remove deprecated `ActiveRecord::Base.disable_implicit_join_references=`.	Arun Agrawal	2013-07-04	1	-5/+0
\| \| \|
* \| \|	Removed unsued deprecation require	Rashmi Yadav	2013-07-04	1	-1/+0
\| \| \|
* \| \|	remove leftover if after deprecation removal (68563128).	Yves Senn	2013-07-04	1	-4/+1
\|/ /
* \|	Remove deprecated nil-passing to `SchemaCache` methods.	Yves Senn	2013-07-04	1	-28/+8
\| \|
* \|	replace artificial space with RDoc markup (follow up #11285). [ci skip]	Yves Senn	2013-07-04	1	-2/+2
\| \|
* \|	Remove deprecated block filter from `ActiveRecord::Migrator#migrate`.	Yves Senn	2013-07-04	1	-9/+1
\| \|
* \|	Merge pull request #11285 from ankit8898/master	Yves Senn	2013-07-04	1	-1/+1
\|\ \ \| \| \| \| \| \|	Fixing the broken wikipedia link for Optimistic Concurrency control [ci skip]
\| * \|	[ci skip] Separated full stop from the Optimistic_concurrency_control wiki ↵	ankit8898	2013-07-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	link d4e3f8ba826cd42aa3c242149
* \| \|	Remove deprecated String constructor from `ActiveRecord::Migrator`.	Yves Senn	2013-07-04	1	-3/+0
\|/ /
* \|	Remove deprecated `scope` use without passing a callable object.	Arun Agrawal	2013-07-03	1	-13/+0
\| \| \| \| \| \| \| \|	Removed tests from deprecated code.
* \|	Remove deprecated `transaction_joinable=`	Arun Agrawal	2013-07-03	1	-6/+0
\| \| \| \| \| \| \| \| \| \|	in favor of `begin_transaction` with `:joinable` option.
* \|	Remove deprecated `decrement_open_transactions`.	Arun Agrawal	2013-07-03	1	-4/+0
\| \|
* \|	removed deprecated increment_open_transactions	Arun Agrawal	2013-07-03	1	-4/+0
\| \|
* \|	method transplanting between modules isn't supported on 1.9	Aaron Patterson	2013-07-03	2	-10/+51
\| \|
* \|	remove deprecated `PostgreSQLAdapter#outside_transaction?` method.	Yves Senn	2013-07-03	1	-7/+0
\| \|
* \|	refactor the method cache objects to have a superclass	Aaron Patterson	2013-07-03	3	-51/+41
\| \|
* \|	keep a cache of writer methods	Aaron Patterson	2013-07-03	1	-11/+34
\| \|
* \|	move the reader method cache in to the read module	Aaron Patterson	2013-07-03	2	-49/+49
\| \|
* \|	keep a cache of the reader methods so we can reuse them	Aaron Patterson	2013-07-03	2	-34/+50
\| \|
* \|	Remove deprecated `ActiveRecord::Fixtures.find_table_name` in favour of ↵	Vipul A M	2013-07-03	1	-6/+0
\| \| \| \| \| \| \| \|	`ActiveRecord::Fixtures.default_fixture_model_name`.
* \|	Removed deprecated method `columns_for_remove`	Neeraj Singh	2013-07-03	1	-6/+0
\| \|
* \|	Merge pull request #10565 from prathamesh-sonpatki/rake-db	Carlos Antonio da Silva	2013-07-02	1	-3/+3
\|\ \ \| \| \| \| \| \|	Improved grammar and replaced 'dbs' slang with 'databases'
\| * \|	Improved grammar and replaced 'dbs' slang with 'databases'	Prathamesh Sonpatki	2013-06-27	1	-3/+3
\| \|/
* \|	Merge pull request #11258 from frodsan/remove_deprecated_distinct	Carlos Antonio da Silva	2013-07-02	1	-9/+0
\|\ \ \| \| \| \| \| \|	Remove deprecated SchemaStatements#distinct
\| * \|	Remove deprecated SchemaStatements#distinct	Francesco Rodriguez	2013-07-02	1	-9/+0
\| \| \|
* \| \|	reduce the amount of code Ruby has to parse	Aaron Patterson	2013-07-02	1	-3/+8
\| \| \|
* \| \|	freeze the constant value so it isn't duped when used as a hash key	Aaron Patterson	2013-07-02	1	-1/+1
\| \| \|
* \| \|	making the comment more accurate	Aaron Patterson	2013-07-02	1	-2/+5
\| \| \|
* \| \|	stop storing multiple copies of a particular attribute name	Aaron Patterson	2013-07-02	3	-16/+16
\| \| \|
* \| \|	eagerly assign the attribute name cache, remove const_missing	Aaron Patterson	2013-07-02	3	-2/+9
\| \| \|
* \| \|	initialize generated modules on inclusion and on inheritence	Aaron Patterson	2013-07-02	1	-1/+1
\| \| \|