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

	Commit message (Expand)	Author	Age	Files	Lines
*	Fixes #20799	Johannes Opper	2015-08-04	11	-2/+111
*	Merge pull request #13897 from gmalette/nested-parameter-filtering-2	Arthur Nogueira Neves	2015-07-06	3	-7/+28
\|\
\| *	Allow filtering params based on parent keys	Guillaume Malette	2015-06-22	3	-7/+28
* \|	Merge pull request #20779 from maurogeorge/secrets-guides	Robin Dupret	2015-07-06	1	-0/+23
\|\ \
\| * \|	Add to Security guides the secrets.yml	Mauro George	2015-07-06	1	-0/+23
* \| \|	Merge pull request #20778 from maurogeorge/ordered_options_bang_doc	Robin Dupret	2015-07-06	1	-0/+8
\|\ \ \
\| * \| \|	Add to RDoc of OrderedOptions the bang info	Mauro George	2015-07-06	1	-0/+8
* \| \| \|	Merge pull request #20767 from y-yagi/remove_unnecessary_fixture_method	Yves Senn	2015-07-06	1	-4/+0
\|\ \ \ \
\| * \| \| \|	remove unnecessary loading fixtures from `navigation_test.rb`	yuuji.yaginuma	2015-07-03	1	-4/+0
\| \|/ / /
* \| \| \|	Merge pull request #20758 from xijo/action_mailer_message_delivery_respects_i...	Kasper Timm Hansen	2015-07-05	4	-9/+25
\|\ \ \ \
\| * \| \| \|	ActionMailer::MessageDelivery respects current I18n.locale	Johannes Opper	2015-07-05	4	-9/+25
* \| \| \| \|	Merge pull request #20782 from kaspth/fix-controller-caching-test	Matthew Draper	2015-07-06	1	-0/+1
\|\ \ \ \ \
\| * \| \| \| \|	Fix the random caching test failure.	Kasper Timm Hansen	2015-07-05	1	-0/+1
* \| \| \| \| \|	Merge pull request #20748 from robin850/reserved-names	Eileen M. Uchitelle	2015-07-05	4	-4/+8
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Display a more human readable list of reserved names	Robin Dupret	2015-07-01	4	-4/+8
* \| \| \| \| \| \|	Refactor cookie_jar to decouple it from request object	eileencodes	2015-07-05	1	-7/+3
* \| \| \| \| \| \|	Add gemfile entry for GlobalID until a new release is cut.	Kasper Timm Hansen	2015-07-05	2	-3/+12
* \| \| \| \| \| \|	Merge pull request #19877 from fny/job-global-id-error-improvement	Kasper Timm Hansen	2015-07-05	2	-7/+21
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Improve error message when serializing unsaved records for jobs	Faraz Yashar	2015-06-28	2	-7/+21
* \| \| \| \| \| \|	Merge pull request #20780 from y-yagi/action_view_overview_guide	Robin Dupret	2015-07-05	1	-8/+0
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	remove reference to `country_options_for_select` and `country_select` from gu...	yuuji.yaginuma	2015-07-05	1	-8/+0
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #20764 from maurogeorge/mailer_image	Vijay Dev	2015-07-04	1	-0/+18
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Create Adding images in Action Mailer Views on guides	Mauro George	2015-07-03	1	-0/+18
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #20773 from jonatack/distinct-instead-of-deprecated-uniq	Kasper Timm Hansen	2015-07-03	1	-2/+3
\|\ \ \ \ \ \
\| * \| \| \| \| \|	[skip ci] #distinct instead of #uniq	Jon Atack	2015-07-03	1	-2/+3
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #20766 from trosborn/diversity	Rafael Mendonça França	2015-07-02	2	-8/+8
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	changes names in guides to better reflect diversity [ci-skip]	Thomas Osborn	2015-07-02	2	-8/+8
\|/ / / / /
* \| \| \| \|	Fix spelling of `Thoughtleadering`	eileencodes	2015-07-02	1	-1/+1
* \| \| \| \|	Use default model enum in fixtures if not defined	eileencodes	2015-07-02	3	-1/+14
* \| \| \| \|	Merge pull request #20760 from claudiob/remove-true-false-class	Xavier Noria	2015-07-02	1	-6/+0
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	[ci skip] Don't use TrueClass, FalseClass in docs	claudiob	2015-07-02	1	-6/+0
\|/ / / /
* \| \| \|	Merge pull request #20631 from repinel/improve-url-for-docs	Robin Dupret	2015-07-01	1	-3/+19
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	[ci skip] Improve the url_for documentation	Roque Pinel	2015-07-01	1	-3/+19
\|/ / /
* \| \|	Separate the constraint and other options [ci skip]	Robin Dupret	2015-07-01	1	-3/+8
* \| \|	Merge pull request #20747 from pwnall/fix_minitest_rails	Kasper Timm Hansen	2015-07-01	1	-3/+3
\|\ \ \
\| * \| \|	Avoid crashing when minitest-rails is loaded.	Victor Costan	2015-07-01	1	-3/+3
\|/ / /
* \| \|	Correct through associations using scopes	Sean Griffin	2015-06-30	4	-6/+16
* \| \|	follow-up to 2183caa, always reenable the task. #20743	Yves Senn	2015-06-30	1	-3/+3
* \| \|	`dump_schema_after_migration` applies migration tasks other than db:migrate	Yves Senn	2015-06-30	3	-15/+27
* \| \|	tests, railties tests should use `bin/` executables when possible.	Yves Senn	2015-06-30	9	-121/+121
* \| \|	Merge pull request #20741 from radar/integration_tool_doc	Rafael Mendonça França	2015-06-30	1	-1/+1
\|\ \ \
\| * \| \|	integration_tool defaults to :test_unit	Ryan Bigg	2015-06-30	1	-1/+1
* \| \| \|	Merge pull request #20734 from srikanthps/master	Rafael Mendonça França	2015-06-29	1	-1/+2
\|\ \ \ \
\| * \| \| \|	To fix #20644	Srikanth Shreenivas	2015-06-30	1	-1/+2
* \| \| \| \|	Merge pull request #20739 from jordondornbos/patch-1	Rafael Mendonça França	2015-06-29	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	fix pluralization in doc [ci skip]	Jordon Dornbos	2015-06-29	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #20735 from vngrs/minor_addition_to_getting_started	Sean Griffin	2015-06-29	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	Minor addition to getting started guide for foreign_key description of refere...	Mehmet Emin İNAÇ	2015-06-29	1	-2/+2
\|/ / / / /
* \| \| \| \|	docs, nodoc `NullPreloader` and `AlreadyLoaded`.	Yves Senn	2015-06-29	1	-2/+2
* \| \| \| \|	Merge pull request #20724 from y-yagi/fix_scaffold_in_full_engine	Yves Senn	2015-06-29	7	-3/+36
\|\ \ \ \ \