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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #13328 from teohm/dbconsole_support_database_url	Yves Senn	2013-12-16	3	-35/+76
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed rails dbconsole to support DATABASE_URL
\| * \| \| \| \| \| \| \| \| \| \|	fixed rails dbconsole to support ENV['DATABASE_URL'].	Huiming Teo	2013-12-16	3	-35/+76
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #13333 from kia84/master	Yves Senn	2013-12-15	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added `absence` parameter to pluralization table [ci skip]
\| * \| \| \| \| \| \| \| \| \| \| \|	Added `absence` parameter to pluralization table	Ivan	2013-12-16	1	-0/+1
\|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added `absence` parameter to table in section `5.1.2 Error Message Interpolation`.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #13307 from akshay-vishnoi/typo	Rafael Mendonça França	2013-12-15	4	-6/+6
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|	Spelling and Grammar check [ci skip]
\| * \| \| \| \| \| \| \| \| \| \|	Spelling and Grammar check [ci skip]	Akshay Vishnoi	2013-12-16	4	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Improve CHANGELOG entry with examples [ci skip]	Rafael Mendonça França	2013-12-15	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #13313 from ccutrer/temp-tables	Rafael Mendonça França	2013-12-15	8	-17/+83
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	support creating temporary tables from queries Conflicts: activerecord/CHANGELOG.md
\| * \| \| \| \| \| \| \| \| \| \| \|	support creating temporary tables from queries	Cody Cutrer	2013-12-14	8	-17/+83
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	also override drop_table in AbstractMySQLAdapter to properly drop temporary tables without committing the transaction
* \| \| \| \| \| \| \| \| \| \| \| \|	Improve the CHANGELOG entry [ci skip]	Rafael Mendonça França	2013-12-15	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #13312 from arthurnn/fix_db_task_req	Rafael Mendonça França	2013-12-15	3	-5/+13
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	db:test:clone and prepare must load environment
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Regression test for load_structure and clone_structure	Arthur Neves	2013-12-14	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	db:test:clone and prepare must load environment	Arthur Neves	2013-12-14	2	-3/+9
\| \| \|_\|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	db:test:clone and db:test:prepare use ActiveRecord::Base. configurations, so we need to load the rails environment, otherwise the config wont be in place.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #13329 from robertomiranda/secret-token-docs	Guillermo Iguaran	2013-12-15	2	-10/+11
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|	[ci-skip] Update secret_key_base Docs
\| * \| \| \| \| \| \| \| \| \| \| \|	Update secret_key_base Docs	robertomiranda	2013-12-15	2	-10/+11
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #13181 from fluxusfrequency/patch-4	Robin Dupret	2013-12-14	1	-221/+603
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Clarification, grammar fixes, punctuation, and capitalization [ci skip]
\| * \| \| \| \| \| \| \| \| \| \|	Word wrapping engines guide [ci skip]	Ben Lewis	2013-12-14	1	-189/+568
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Clarification, grammar fixes, punctuation, and capitalization [ci skip]	Ben Lewis	2013-12-14	1	-84/+87
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #13325 from kuldeepaggarwal/docs-update	Guillermo Iguaran	2013-12-14	4	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improved documents [ci skip]
\| * \| \| \| \| \| \| \| \| \| \| \|	Improved documents [ci skip]	Kuldeep Aggarwal	2013-12-14	4	-4/+4
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #13324 from fphilipe/fix-syntax-error-in-example	Rafael Mendonça França	2013-12-14	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Fix syntax error in redirect_to example
\| * \| \| \| \| \| \| \| \| \| \|	Fix syntax error in redirect_to example	Philipe Fatio	2013-12-14	1	-1/+1
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Without parenthesis, ruby assumes that curly braces denote the beginning of a block.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #13316 from JuanitoFatas/working-with-js	Godfrey Chan	2013-12-14	1	-5/+15
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Improve document: working with javascript in rails [ci skip].
\| * \| \| \| \| \| \| \| \| \|	Improve document: working with javascript in rails [ci skip].	Juanito Fatas	2013-12-14	1	-5/+15
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Add form_tag generated output. * improve some text. * data-remote='true' should use double quotes.
* \| \| \| \| \| \| \| \| \|	Fix typo [ci skip]	Rafael Mendonça França	2013-12-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #13298 from rails/secret_tokens	Guillermo Iguaran	2013-12-13	8	-15/+79
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create config/secrets.yml file for store of tokens
\| * \| \| \| \| \| \| \| \| \|	Add comment about secret_key_base in secrets.yml	Guillermo Iguaran	2013-12-13	1	-0/+12
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Rename tokens.yml to secrets.yml	Guillermo Iguaran	2013-12-12	5	-6/+6
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add test for custom tokens stored in config/tokens.yml	Guillermo Iguaran	2013-12-12	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Replace config.secret_key_base with secrets.secret_key_base in test	Guillermo Iguaran	2013-12-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Load secret_key_base from tokens.yml, fallback to config.secret_key_base	Guillermo Iguaran	2013-12-12	5	-12/+54
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove secret_token.rb	Guillermo Iguaran	2013-12-12	1	-12/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add config/tokens.yml template	Guillermo Iguaran	2013-12-12	2	-0/+9
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #13309 from arunagw/warning-fix-argumnet	Rafael Mendonça França	2013-12-13	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	argument prefix warning removed
\| * \| \| \| \| \| \| \| \| \| \|	argument prefix warning removed	Arun Agrawal	2013-12-13	1	-1/+1
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* interpreted as a argument prefix
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #13306 from kassio/master	Rafael Mendonça França	2013-12-13	2	-4/+9
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix mysql to support duplicated column names
\| * \| \| \| \| \| \| \| \| \| \|	Fix mysql to support duplicated column names	Kassio Borges	2013-12-13	2	-4/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will fix the [broken test](https://github.com/rails/rails/commit/4a2650836680f51490e999c3c8441a2f9adff96e) `test_with_limiting_with_custom_select`. The query's result was built in a hash with column name as key, if the result have a duplicated column name the last value was overriding the first one.
* \| \| \| \| \| \| \| \| \| \| \|	refactor, reuse assertions in range_test.rb.	Yves Senn	2013-12-13	1	-186/+111
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	extract PG range tests from datatype_test.rb into range_test.rb	Yves Senn	2013-12-13	3	-296/+321
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #13305 from psahni/form_tag_with_parameters	Yves Senn	2013-12-13	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	form_tag with parameters fixed [ci skip]
\| * \| \| \| \| \| \| \| \| \| \|	form_tag with parameters fixed [ ci skip ]	Prashant Sahni	2013-12-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #13303 from dvsuresh/typo_postgresqlyml	Arun Agrawal	2013-12-12	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct comment in databases/postgresql.yml [ci skip]
\| * \| \| \| \| \| \| \| \| \| \| \|	Correct comment in databases/postgresql.yml	DV Suresh	2013-12-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Add a bunch of Relation -> Array delegate methods to the whitelist. This ↵	Jeremy Kemper	2013-12-12	2	-32/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	won't last - aim to switch back to a blacklist for mutator methods.
* \| \| \| \| \| \| \| \| \| \| \| \|	Perf: save ~9% of object allocations on heavy requests.	Jeremy Kemper	2013-12-12	1	-2/+5
\|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The per-thread registry is keyed on the class name, and each request for the class name returns a new string. This is in the hot path for a lot of Active Record behavior, so we easily accumulate thousands of repeated strings. To fix, we simply cache the key when the class is first extended with the module. TODO: Eliminate this module. The per-thread instance concept is common, but this technique confuses and obfuscates.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #13302 from afshinator/master	Lauro Caetano	2013-12-12	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix grammatical error
\| * \| \| \| \| \| \| \| \| \| \| \|	fix grammatical error	Afshin Mokhtari	2013-12-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #12590 from laurocaetano/whitelist-to-delegate-array-methods	Rafael Mendonça França	2013-12-12	4	-104/+105
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create a whitelist of methods to be delegated to Array.
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Use `public_send` instead of just use `send`.	Lauro Caetano	2013-12-12	2	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Use a whitelist to delegate methods to array	Lauro Caetano	2013-12-12	2	-75/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \|