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

	Commit message (Expand)	Author	Age	Files	Lines
*	Add method_source dependency to activesupport	Thomas Walpole	2015-07-29	2	-0/+2
*	Merge pull request #21065 from rails/schneems/fix-assets_test	Richard Schneeman	2015-07-29	2	-0/+2
\|\
\| *	Fix rake/notes_test	schneems	2015-07-29	1	-0/+1
\| *	Fix reported regression rails/sprockets-rails#265	schneems	2015-07-29	1	-0/+1
\|/
*	Merge pull request #21056 from yui-knk/fix/deprecation_silence	Rafael Mendonça França	2015-07-29	1	-1/+4
\|\
\| *	Make silence a warning inserted by commit #4b3f8ac	yui-knk	2015-07-30	1	-1/+4
* \|	Merge pull request #21054 from yui-knk/fix/doc_field_error_proc	Claudio B.	2015-07-29	1	-1/+1
\|\ \ \| \|/ \|/\|
\| *	[ci skip] `field_error_proc` is used in `ActionView::Helpers::ActiveModelInst...	yui-knk	2015-07-29	1	-1/+1
\|/
*	Merge pull request #21049 from y-yagi/fix_i18n_validation_test	Carlos Antonio da Silva	2015-07-28	1	-1/+1
\|\
\| *	pass the correct argument to mock on a test of `validates_length_of`	yuuji.yaginuma	2015-07-28	1	-1/+1
\|/
*	Tiny documentation edits [ci skip]	Robin Dupret	2015-07-28	3	-6/+8
*	Merge pull request #21048 from yui-knk/fix/guide_about_action_pack2	Yves Senn	2015-07-28	1	-1/+1
\|\
\| *	[ci skip] Add a link to action_controller_overview.html	yui-knk	2015-07-28	1	-1/+1
\|/
*	Merge pull request #21047 from yui-knk/fix/guide_about_action_pack	Robin Dupret	2015-07-28	1	-1/+1
\|\
\| *	[ci skip] Now Action View is completely separated from Action Pack	yui-knk	2015-07-28	1	-1/+1
\|/
*	Add `:nodoc:` for internal testing methods [ci skip]	Robin Dupret	2015-07-28	5	-9/+9
*	Merge pull request #20590 from vngrs/set_default_charset	Rafael Mendonça França	2015-07-27	2	-6/+13
\|\
\| *	Document, refactor and create test case for ActionDispatch::Response#charset=...	Mehmet Emin İNAÇ	2015-06-17	2	-6/+13
* \|	Merge pull request #20849 from vngrs/misleading_nested_exceptions	Rafael Mendonça França	2015-07-27	5	-8/+36
\|\ \
\| * \|	Fix misleading errors for has_one through relations	Mehmet Emin İNAÇ	2015-07-22	5	-8/+36
* \| \|	Merge pull request #20759 from vngrs/fix_wrong_doc	Rafael Mendonça França	2015-07-27	1	-2/+2
\|\ \ \
\| * \| \|	Change wrong usage in documentation about autoload_paths [ci skip]	Mehmet Emin İNAÇ	2015-07-02	1	-2/+2
* \| \| \|	Merge pull request #21031 from vngrs/fix_params_wrapper_doc	Rafael Mendonça França	2015-07-27	1	-3/+3
\|\ \ \ \
\| * \| \| \|	Fix params_wrapper doc [ci skip]	Mehmet Emin İNAÇ	2015-07-26	1	-3/+3
* \| \| \| \|	Merge pull request #20904 from kaspth/wildcard-template-dependencies	Kasper Timm Hansen	2015-07-27	9	-12/+121
\|\ \ \ \ \
\| * \| \| \| \|	Add wildcard template dependencies.	Kasper Timm Hansen	2015-07-26	9	-12/+121
* \| \| \| \| \|	Merge pull request #21040 from aditya-kapoor/fix-typo	Arthur Nogueira Neves	2015-07-27	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	[ci skip] it should be protect_from_forgery	Aditya Kapoor	2015-07-27	1	-1/+1
* \| \| \| \| \| \|	Merge pull request #21003 from robin850/api-plugins	Rafael Mendonça França	2015-07-27	5	-9/+84
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Enable the `api_only` option for API plugins' generators	Robin Dupret	2015-07-23	2	-0/+27
\| * \| \| \| \| \| \|	Generate an API dummy application for API plugins	Robin Dupret	2015-07-23	2	-0/+9
\| * \| \| \| \| \| \|	Make ApplicationController inherit from AC::API for API plugins	Robin Dupret	2015-07-23	2	-1/+9
\| * \| \| \| \| \| \|	Skip assets, helpers and views generation for API plugins	Robin Dupret	2015-07-23	2	-8/+27
\| * \| \| \| \| \| \|	Add the `--api` option for the plugin generator	Robin Dupret	2015-07-23	2	-0/+12
* \| \| \| \| \| \| \|	Merge pull request #21035 from radar/ryan-bigg-has-changed-jobs	Godfrey Chan	2015-07-26	1	-1/+1
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Ryan Bigg has changed jobs.	Ryan Bigg	2015-07-27	1	-1/+1
* \| \| \| \| \| \| \| \|	Merge pull request #21030 from yahonda/mysql2_20969	Kasper Timm Hansen	2015-07-26	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove @connection instance variable only when defined	Yasuo Honda	2015-07-26	1	-2/+2
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Properly allow uniqueness validations on primary keys.	Sean Griffin	2015-07-25	3	-1/+28
* \| \| \| \| \| \| \|	Merge pull request #21007 from clayton-shopify/fix-mailto-encoding	Rafael Mendonça França	2015-07-24	2	-1/+9
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Encode the email address as prescribed in RFC 6068 section 2.	Clayton Smith	2015-07-23	2	-1/+9
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	`destroy` shouldn't raise when child associations fail to save	Sean Griffin	2015-07-24	4	-1/+48
* \| \| \| \| \| \| \|	Merge pull request #20256 from arunagw/aa-remove-unused-rule-and-task-activer...	Sean Griffin	2015-07-24	1	-9/+0
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Remove unused rule and task from activerecord	Arun Agrawal	2015-05-22	1	-9/+0
* \| \| \| \| \| \| \| \|	Merge pull request #20928 from matthewd/unload-interlock	Matthew Draper	2015-07-24	5	-35/+385
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Small tweaks to mainly lock-ordering tests.	thedarkone	2015-07-22	1	-21/+58
\| * \| \| \| \| \| \| \| \|	Handle thread death during lock acquisition	Matthew Draper	2015-07-21	2	-4/+27
\| * \| \| \| \| \| \| \| \|	Adjust expectations around purpose/compatibility options	Matthew Draper	2015-07-21	2	-9/+36
\| * \| \| \| \| \| \| \| \|	Add some meta-assertions for the custom assertions	Matthew Draper	2015-07-21	1	-11/+63
\| * \| \| \| \| \| \| \| \|	Order of execution is only guaranteed if upgrading	Matthew Draper	2015-07-21	2	-2/+4