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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'dilizarov-feature/alias_request_uuid_method_to_request_id'	Rafael Mendonça França	2015-02-20	6	-10/+22
\|\
\| *	Prefer request_id over uuid and test the alias	Rafael Mendonça França	2015-02-20	4	-10/+14
\| *	Aliased the ActionDispatch::Request#uuid method with ActionDispatch::Request#...	David Ilizarov	2015-02-20	3	-1/+9
\|/
*	Merge pull request #17069 from modosc/master	Rafael Mendonça França	2015-02-20	1	-7/+9
\|\
\| *	move cache_digests rake methods into their own namespace	jonathan schatz	2014-09-26	1	-7/+9
* \|	Merge pull request #18218 from brainopia/fix_match_shorthand_in_routes	Rafael Mendonça França	2015-02-20	2	-1/+10
\|\ \
\| * \|	Improve shorthand matching for routes	brainopia	2015-01-25	2	-1/+10
* \| \|	Merge branch 'rm-take' into 4-1-stable	Rafael Mendonça França	2015-02-20	3	-1/+43
* \| \|	s/around_filter/around_action/	Akira Matsuda	2015-02-21	1	-1/+1
* \| \|	Do not test, document or use a private API method	Rafael Mendonça França	2015-02-20	3	-28/+0
* \| \|	Merge pull request #16989 from Empact/reload-cache-clear	Rafael Mendonça França	2015-02-20	6	-28/+53
\|\ \ \
\| * \| \|	Isolate access to @associations_cache and @aggregations cache to the Associat...	Ben Woosley	2014-09-28	9	-32/+66
* \| \| \|	Merge pull request #19018 from lucasmazza/lm-activemodel-validate-bang	Rafael Mendonça França	2015-02-20	4	-14/+55
\|\ \ \ \
\| * \| \| \|	Move the `validate!` method to `ActiveModel::Validations`.	Lucas Mazza	2015-02-20	4	-14/+55
* \| \| \| \|	Merge pull request #16993 from Empact/simplify-find_by-statement-cache	Rafael Mendonça França	2015-02-20	1	-16/+18
\|\ \ \ \ \
\| * \| \| \| \|	Simplify `find_by_statement_cache` interaction down to a class-level ivar wit...	Ben Woosley	2014-09-22	1	-20/+18
* \| \| \| \| \|	Merge pull request #19017 from mcmorgan/active-job-docs-use-sentence-case-for...	Rafael Mendonça França	2015-02-20	1	-5/+5
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Use sentence case for consistency in comments	Marcel Morgan	2015-02-20	1	-5/+5
\|/ / / / /
* \| \| \| \|	Merge pull request #19015 from antstorm/fix-cache-helper-erb-block-in-comment	Rafael Mendonça França	2015-02-20	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	Fix cache_helper comment ERB	Anthony Dmitriyev	2015-02-20	1	-2/+2
* \| \| \| \| \|	Merge pull request #17139 from mfazekas/fix_becomes_changed_attributes	Rafael Mendonça França	2015-02-20	3	-1/+14
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Always reset changed attributes in becomes	Miklos Fazekas	2015-02-04	3	-1/+14
* \| \| \| \| \|	Merge pull request #17143 from kuldeepaggarwal/fix-mailTo	Rafael Mendonça França	2015-02-20	2	-1/+6
\|\ \ \ \ \ \
\| * \| \| \| \| \|	do not generate blank options in mailTo	Kuldeep Aggarwal	2014-10-02	2	-2/+8
* \| \| \| \| \| \|	Merge pull request #18914 from kamipo/format_time_according_to_precision	Rafael Mendonça França	2015-02-20	13	-44/+168
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Add schema dumping tests for datetime and time precision	Ryuta Kamizono	2015-02-20	3	-8/+34
\| * \| \| \| \| \| \|	Format the time string according to the precision of the time column	Ryuta Kamizono	2015-02-20	7	-22/+45
\| * \| \| \| \| \| \|	Allow `:precision` option for time type columns	Ryuta Kamizono	2015-02-20	8	-14/+89
* \| \| \| \| \| \| \|	Merge pull request #18665 from sgrif/sg-test-route-all	Sean Griffin	2015-02-20	2	-8/+36
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Allow `method: "all"` as a valid routing test option	Sean Griffin	2015-01-23	2	-8/+36
* \| \| \| \| \| \| \| \|	Merge pull request #17144 from skojin/patch-doc-validation-format-z-regexp	Rafael Mendonça França	2015-02-20	1	-1/+1
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	fix mistype in doc about \z regexp	Sergey Kojin	2014-10-02	1	-1/+1
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Use a name that better reflect the return value	Rafael Mendonça França	2015-02-20	1	-2/+2
* \| \| \| \| \| \| \| \|	Merge pull request #17138 from jpcody/rename_default_form_builder	Rafael Mendonça França	2015-02-20	1	-2/+2
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Rename default_form_builder to avoid collision	Joshua Cody	2014-10-01	1	-2/+2
* \| \| \| \| \| \| \| \| \|	Merge pull request #19012 from LeandroSNunes/api_select_tag	Rafael Mendonça França	2015-02-20	1	-2/+1
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Corrects the API to method select_tag	Leandro Nunes	2015-02-20	1	-2/+1
\| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #19013 from y-yagi/custom_validators_example	Abdelkader Boudih	2015-02-20	3	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	use `messages` instead of deprecated `ActiveModel::Errors#[]=` method [ci skip]	yuuji.yaginuma	2015-02-20	3	-3/+3
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #19007 from evanphx/route_proxy	Rafael Mendonça França	2015-02-19	3	-6/+9
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Make the helpers a required argument	Evan Phoenix	2015-02-19	2	-3/+3
\| * \| \| \| \| \| \| \| \|	Cache url_helpers instead of creating each time	Evan Phoenix	2015-02-19	2	-5/+8
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #19005 from meganemura/remove-last-empty-line-in-gemfile	Rafael Mendonça França	2015-02-19	2	-2/+2
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Remove last empty line when we don't use Windows or JRuby	meganemura	2015-02-20	2	-2/+2
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #19004 from danieldevries/fix-migration-fieldname-in-example	Abdelkader Boudih	2015-02-19	1	-1/+1
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	fix column name in migration example [ci skip]	Daniël de Vries	2015-02-19	1	-1/+1
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #19002 from bdewater/patch-1	Abdelkader Boudih	2015-02-19	1	-2/+2
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Fix code sample for custom exception handler [ci skip]	Bart	2015-02-19	1	-2/+2
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #18996 from morgoth/deprecate-more-errors-methods	Yves Senn	2015-02-19	6	-10/+45
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Deprecate `ActiveModel::Errors` `add_on_empty` and `add_on_blank` methods	Wojciech Wnętrzak	2015-02-19	6	-10/+43