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

	Commit message (Expand)	Author	Age	Files	Lines
*	Introduce Module#concerning	Jeremy Kemper	2013-12-17	4	-0/+219
*	MySQL: remove the old-school 'packets out of order' message	Jeremy Kemper	2013-12-17	1	-6/+0
*	use `bin/spring` in release notes. [ci skip]	Yves Senn	2013-12-17	1	-1/+1
*	Merge pull request #13332 from rails/pixeltrix/mail_view	Guillermo Iguaran	2013-12-16	21	-26/+765
\|\
\| *	Add mailer previews feature based on mail_view gem	Andrew White	2013-12-17	17	-6/+736
\| *	Add an application controller for internal controllers	Andrew White	2013-12-17	3	-18/+23
\| *	Fix method redefinition warning	Andrew White	2013-12-17	1	-2/+6
\|/
*	Merge pull request #12873 from martinemde/fix-where-assoc-nil	Carlos Antonio da Silva	2013-12-16	3	-3/+104
\|\
\| *	Better support for `where()` conditions that use an association name.	Martin Emde	2013-12-16	3	-3/+104
\|/
*	Remove the link for code.whytheluckystiff.net	Rafael Mendonça França	2013-12-16	1	-1/+1
*	Merge pull request #13338 from shreve/patch-1	Rafael Mendonça França	2013-12-16	1	-1/+1
\|\
\| *	Fix url leak in application templates guide	Jacob Evan Shreve	2013-12-16	1	-1/+1
\|/
*	Merge pull request #13321 from mezis/fix-safebuffer-interpolation-master	Jeremy Kemper	2013-12-16	2	-7/+37
\|\
\| *	Fixes interpolation on SafeBuffer	Julien Letessier	2013-12-14	2	-7/+37
* \|	Fix missing closing rdoc tag [ci skip]	Carlos Antonio da Silva	2013-12-16	1	-1/+1
* \|	Merge pull request #13328 from teohm/dbconsole_support_database_url	Yves Senn	2013-12-16	3	-35/+76
\|\ \
\| * \|	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	Ivan	2013-12-16	1	-0/+1
\|/ / /
* \| \|	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]	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	Cody Cutrer	2013-12-14	8	-17/+83
* \| \| \| \|	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
\|\ \ \ \ \
\| * \| \| \| \|	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
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge pull request #13329 from robertomiranda/secret-token-docs	Guillermo Iguaran	2013-12-15	2	-10/+11
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	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
\|\ \ \ \
\| * \| \| \|	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]	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	Philipe Fatio	2013-12-14	1	-1/+1
\|/ / / /
* \| \| \|	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].	Juanito Fatas	2013-12-14	1	-5/+15
\|/ / /
* \| \|	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
\|\ \ \
\| * \| \|	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	Arun Agrawal	2013-12-13	1	-1/+1
\|/ / / /