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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Document where `column` param gets utilized in `substitute_at`.	Vipul A M	2013-07-01	1	-2/+2
\|
*	Merge pull request #11109 from ↵	Yves Senn	2013-06-25	1	-8/+9
\|\ \| \| \| \| \| \| \| \|	wangjohn/moving_pluck_and_ids_to_new_delegate_line Moving the `pluck` and `ids` methods to their own delegate line.
\| *	Moving the `pluck` and `ids` methods to their own delegate line.	wangjohn	2013-06-25	1	-8/+9
\|/ \| \| \| \| \| \| \|	These two methods aren't really statistical helper methods and don't really belong in any other group which is being delegated for querying, so I'm moving them to their own group of methods. I've also changed the `:to => :all` hash syntax to `to: :all`.
*	Fix @tenderlove's name in changelog :sparkles:	Carlos Antonio da Silva	2013-06-26	1	-2/+2
\| \| \| \|	[ci skip]
*	Merge pull request #10542 from waseem/remove_require	Carlos Antonio da Silva	2013-06-25	1	-1/+0
\|\ \| \| \| \|	Remove unnecessary require from active_support/inflector/methods.rb
\| *	Remove unnecessary require from active_support/inflector/methods.rb	Waseem Ahmad	2013-05-10	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \|	`active_support/inflections` already requires `active_support/inflector/inflections`. There's no need to require it in `active_support/inflector/methods`.
* \|	Merge pull request #10774 from ↵	Carlos Antonio da Silva	2013-06-25	4	-4/+15
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	chuckbergeron/validates-inclusion-of-accuracy-for-non-numeric-ranges Greater accuracy for validates_inclusion_of on non-numeric ranges Closes #10774, fixes #10593
\| * \|	Use Range#cover? for Numeric ranges (tests via endpoints) and use ↵	Charles Bergeron	2013-05-27	4	-4/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Range#include? for non-numeric ranges added changelog message
* \| \|	Merge pull request #10627 from vipulnsward/destructive_symbolize	Carlos Antonio da Silva	2013-06-25	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Change to destructive `deep_symbolize_keys` to avoid a new hash creation.
\| * \| \|	change to destructive `deep_symbolize_keys` after ↵	Vipul A M	2013-05-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/rails/rails/commit/df24b8790f22384a068fece7042f04ffd2fcb33e which allows to do so. This helps to avoid extra hash object creation, by symbolizing inplace
* \| \| \|	Merge pull request #10666 from YanhaoYang/master	Carlos Antonio da Silva	2013-06-25	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Make "rails dbconsole" work with activerecord-postgis-adapter
\| * \| \| \|	make "rails dbconsole" work with activerecord-postgis-adapter	YanhaoYang	2013-05-17	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #10730 from ↵	Carlos Antonio da Silva	2013-06-25	1	-8/+9
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	tkhr/add_test_for_AR__CounterCache#update_counters Add test for AR::CounterCache.update_counters
\| * \| \| \| \|	Refactor AR's counter_cache_test.rb test	Takehiro Adachi	2013-05-23	1	-8/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Add test for AR::CounterCache.update_counters	Takehiro Adachi	2013-05-23	1	-0/+6
\| \| \| \| \| \|
* \| \| \| \| \|	Add changelog entry for database tasks removal #10853 [ci skip]	Carlos Antonio da Silva	2013-06-25	1	-0/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #10853 from kennyj/deprecated-database_tasks	Carlos Antonio da Silva	2013-06-25	7	-433/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Oracle / Sqlserver / Firebird database tasks were deprecated since 4.0.
\| * \| \| \| \| \|	Remove FirebirdDatabaseTasks was deprecated, because this was provided by ↵	kennyj	2013-06-05	3	-158/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	3rd-party.
\| * \| \| \| \| \|	Remove SqlseverDatabaseTasks was deprecated, because this was provided by ↵	kennyj	2013-06-05	3	-136/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	3rd-party.
\| * \| \| \| \| \|	Remove OracleDatabaseTasks was deprecated, because this was provided by ↵	kennyj	2013-06-05	3	-139/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	3rd-party.
* \| \| \| \| \| \|	Merge branch 'cache-fragment-refactor'	Carlos Antonio da Silva	2013-06-25	1	-13/+17
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #10819
\| * \| \| \| \| \| \|	Refactor cache fragment handling with read/write methods	Carlos Antonio da Silva	2013-06-25	1	-6/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Move the write portion of fragment_for to its own method to allow for easier ↵	Andrew Rove	2013-06-25	1	-10/+14
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	creation of custom cache methods.
* \| \| \| \| \| \|	Merge pull request #10992 from Empact/find-each-enumerator	Carlos Antonio da Silva	2013-06-25	3	-2/+36
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When .find_each is called without a block, return an Enumerator.
\| * \| \| \| \| \| \|	When .find_each is called without a block, return an Enumerator.	Ben Woosley	2013-06-19	3	-2/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This lets us do things like call: .find_each.with_index
* \| \| \| \| \| \| \|	Merge pull request #10993 from Empact/result-each-enumerator	Carlos Antonio da Silva	2013-06-25	3	-1/+42
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change Result#each to return an Enumerator when called without a block.
\| * \| \| \| \| \| \| \|	Change Result#each to return an Enumerator when called without a block.	Ben Woosley	2013-06-18	3	-1/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As with #10992, this lets us call #with_index, etc on the results.
* \| \| \| \| \| \| \| \|	Merge pull request #11105 from mariozig/correct-documentation	Carlos Antonio da Silva	2013-06-25	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in docs. HABTM associations should use a pluralized name [ci skip]
\| * \| \| \| \| \| \| \| \|	Fix typo in docs. HABTM associations should use a pluralized name	mariozig	2013-06-25	2	-2/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #11000 from sbeckeriv/accept_header	Carlos Antonio da Silva	2013-06-25	3	-1/+15
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix undefined method `ref' for nil:NilClass for bad accept headers
\| * \| \| \| \| \| \| \| \|	Fix undefined method `ref' for nil:NilClass for bad accept headers	Stephen Becker IV	2013-06-19	3	-1/+11
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #11046 from arunagw/verbose_mode_on	Carlos Antonio da Silva	2013-06-25	5	-5/+7
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Verbose mode on when running tests
\| * \| \| \| \| \| \| \| \| \|	Adding verbose in isolated test.	Arun Agrawal	2013-06-21	5	-5/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Adding verbose mode to test_with_ar_integration	Arun Agrawal	2013-06-21	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'error-explanation'	Carlos Antonio da Silva	2013-06-25	2	-6/+6
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #11077 [ci skip]
\| * \| \| \| \| \| \| \| \| \| \|	Fix another "error_explanation" css class in guides [ci skip]	Carlos Antonio da Silva	2013-06-25	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	change id="errorExplanation" to id="error_explanation" to match the ↵	Luzi Humm	2013-06-25	1	-3/+3
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	generated files
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #11096 from akalyaev/remove-unnecessary-mapping	Carlos Antonio da Silva	2013-06-25	1	-5/+5
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	removed unnecessary mapping for on options
\| * \| \| \| \| \| \| \| \| \| \|	removed unnecessary mapping for on options	Anton Kalyaev	2013-06-25	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Right before that in `assert_valid_transaction_action` method we make sure that `options[:on]` contains values from `ACTIONS` array (`[:create, :destroy, :update]`) and nothing more (i.e. it could not contain strings or something else, otherwise the error is raised). Also I've polished some docs.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #11095 from vipulnsward/rails_4_docs	Xavier Noria	2013-06-25	3	-5/+8
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We are now rails 4
\| * \| \| \| \| \| \| \| \| \| \| \|	We are now rails 4 [skip-ci]	Vipul A M	2013-06-26	3	-5/+8
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #11098 from vredniy/master	Rafael Mendonça França	2013-06-25	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed menu section's location (guides)
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fixed menu section's location (guides)	Dima Zudochkin	2013-06-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #11097 from ryancw/patch-2	Rafael Mendonça França	2013-06-25	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	ActionView flows comment typo
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Comment typo	Ryan Williams	2013-06-25	1	-2/+2
\|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #11093 from nolman/restoring-scaffold-generation	Rafael Mendonça França	2013-06-25	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|	restore correct scaffold generation
\| * \| \| \| \| \| \| \| \| \| \| \|	restore correct scaffold generation	Nolan Evans	2013-06-25	1	-1/+1
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Change reference to all to scoped instead.	Steve Klabnik	2013-06-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In #11088, `#to_a` was added to remove a deprecation around using `#all`. I merged, but it really should have been `#scoped` instead, as that's the preferred replacement.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #11088 from nolman/nolman/scaffold-fix	Steve Klabnik	2013-06-25	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	fix deprecation warning in scaffold controllers
\| * \| \| \| \| \| \| \| \| \| \|	fix deprecation warning in scaffold controllers	Nolan Evans	2013-06-25	1	-1/+1
\|/ / / / / / / / / / /