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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #19046 from yui-knk/fix/orm	Abdelkader Boudih	2015-02-23	1	-1/+1
\|\
\| *	[ci skip] Fix `Object-Relational` to `Object Relational`	yui-knk	2015-02-24	1	-1/+1
\|/
*	Merge pull request #18937 from simi/optional-belongs-to	Rafael Mendonça França	2015-02-23	14	-10/+166
\|\
\| *	Require `belongs_to` by default.	Josef Šimánek	2015-02-21	14	-10/+166
* \|	Merge pull request #19032 from jvanbaarsen/changed-ajadapter-env-var	Rafael Mendonça França	2015-02-23	6	-7/+7
\|\ \
\| * \|	Changed the AJADAPTER to AJ_ADAPTER	Jeroen van Baarsen	2015-02-22	6	-7/+7
* \| \|	Merge pull request #19044 from y-yagi/mime_type_doc	Abdelkader Boudih	2015-02-23	1	-1/+1
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	fix method name in mime type example. `Mime::Type.[]` doesn't exist. [ci skip]	yuuji.yaginuma	2015-02-23	1	-1/+1
\|/ /
* \|	Minor guides edits [ci skip]	Robin Dupret	2015-02-21	2	-24/+23
* \|	Merge pull request #19026 from rousisk/master	Robin Dupret	2015-02-21	1	-2/+3
\|\ \
\| * \|	Improve wording on find_by note regarding returning only one record [ci skip]	Konstantinos Rousis	2015-02-21	1	-2/+3
\|/ /
* \|	[ci skip] Use explicit module namespace in guide	Kasper Timm Hansen	2015-02-21	1	-1/+3
* \|	guides, fully qualify `ApplicationController`. Closes #19024.	Yves Senn	2015-02-21	1	-1/+1
* \|	Merge pull request #19023 from trliner/fix_has_secure_token_docs	Abdelkader Boudih	2015-02-21	1	-2/+2
\|\ \
\| * \|	Fix #has_secure_token documentation [ci skip]	Tim Liner	2015-02-20	1	-2/+2
\|/ /
* \|	Merge pull request #17558 from OpenSourceProjects/test_error_messages	Rafael Mendonça França	2015-02-20	7	-10/+19
\|\ \
\| * \|	Error message testing fix	Franky W	2015-02-20	7	-10/+19
\|/ /
* \|	Oops :bomb:	Rafael Mendonça França	2015-02-20	1	-1/+1
* \|	Change the deprecation messages to show the preferred way to work with	Rafael Mendonça França	2015-02-20	4	-12/+12
* \|	Fix changelog indent [ci skip]	Carlos Antonio da Silva	2015-02-20	1	-2/+2
* \|	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