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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #28210 from cefigueiredo/improve_required_test	Rafael França	2017-02-28	1	-7/+35
\|\
\| *	Ensure that tests will reset belongs_to_requierd_by_default config	Carlos Figueiredo	2017-02-27	1	-23/+27
\| *	Make required by default test for belongs_to association clearer	Carlos Figueiredo	2017-02-27	1	-1/+25
* \|	Merge pull request #28217 from kamipo/create_join_table_respects_reference_ke...	Rafael França	2017-02-28	2	-8/+17
\|\ \
\| * \|	`create_join_table` should respect `references` column type	Ryuta Kamizono	2017-02-28	2	-8/+17
* \| \|	Merge pull request #28063 from Erol/prioritize-callback-on-action-before-if	Rafael França	2017-02-28	2	-1/+41
\|\ \ \
\| * \| \|	Prioritize checking `:on` actions before `:if` for transaction callbacks	Erol Fornoles	2017-02-21	2	-1/+41
* \| \| \|	Revert "Dupping a CollectionProxy should dup the load_target"	eileencodes	2017-02-28	2	-12/+0
* \| \| \|	Merge pull request #28214 from kamipo/use_tables	Rafael França	2017-02-28	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Use `tables` instead of `data_sources - views`	Ryuta Kamizono	2017-02-28	1	-1/+1
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #28215 from y-yagi/take_failed_screenshot_before_reset_driver	Rafael França	2017-02-28	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Take failed screenshot before reset driver	yuuji.yaginuma	2017-02-28	1	-1/+1
* \| \| \| \|	Merge pull request #28202 from baerjam/improve-testing-your-mailers-documenta...	Rafael França	2017-02-28	1	-0/+4
\|\ \ \ \ \
\| * \| \| \| \|	Improve documentation for Testing Your Mailers [ci skip]	James Baer	2017-02-28	1	-0/+4
* \| \| \| \| \|	Merge pull request #28222 from kenta-s/fix-railstutorial-url	Vipul A M	2017-02-28	2	-2/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix http -> https [ci skip]	kenta-s	2017-02-28	2	-2/+2
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Dupping a CollectionProxy should dup the load_target	eileencodes	2017-02-28	2	-0/+12
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #28208 from yahonda/rails28183_oracle	Andrew White	2017-02-28	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Oracle database also does not allow aliases in the having clause	Yasuo Honda	2017-02-27	1	-1/+1
\| \|/ / /
* \| \| \|	Merge pull request #28212 from y-yagi/user_released_webpacker_in_new_applicat...	Rafael França	2017-02-27	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Use released webpacker in new applications	yuuji.yaginuma	2017-02-28	1	-1/+1
\| \|/ / /
* \| \| \|	Merge pull request #28061 from andrewhood125/strip_tags_update	Rafael França	2017-02-27	3	-4/+19
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Remove `encode_special_chars` option from `strip_tags`	Andrew Hood	2017-02-27	3	-4/+19
\|/ / /
* \| \|	Merge pull request #28196 from y-yagi/set_correct_host_except_development_env...	Andrew White	2017-02-27	2	-3/+25
\|\ \ \
\| * \| \|	Set correct host except development environment	yuuji.yaginuma	2017-02-27	2	-3/+25
* \| \| \|	Merge pull request #28199 from kirs/ar-test-connection	Matthew Draper	2017-02-28	1	-1/+4
\|\ \ \ \
\| * \| \| \|	Handle non-existing $ARCONN	Kir Shatrov	2017-02-27	1	-1/+4
* \| \| \| \|	Merge pull request #28160 from y-yagi/only_load_systemtestcase_if_puma_is_def...	Eileen M. Uchitelle	2017-02-27	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	Only load SystemTestCase if Puma is defined	yuuji.yaginuma	2017-02-27	1	-2/+2
* \| \| \| \| \|	Merge pull request #28188 from kamipo/use_max_identifier_length_for_index_nam...	Andrew White	2017-02-26	4	-8/+8
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Use `max_identifier_length` for `index_name_length` in PostgreSQL adapter	Ryuta Kamizono	2017-02-27	4	-8/+8
* \| \| \| \| \| \|	Merge pull request #28187 from kamipo/fix_intermittent_test_failure	Andrew White	2017-02-26	1	-0/+3
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Fix `test_apply_distinct_in_count` failure in PG adapter	Ryuta Kamizono	2017-02-27	1	-0/+3
* \| \| \| \| \| \| \|	Merge pull request #25274 from kamipo/fix_find_nth_with_limit_value	Andrew White	2017-02-26	2	-6/+10
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Fix `find_nth` with `limit_value`	Ryuta Kamizono	2017-02-26	2	-6/+10
* \| \| \| \| \| \| \| \|	Merge pull request #28190 from annejohnson/update-i18n-guide-with-zero-opt	Jon Moss	2017-02-26	1	-2/+8
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update i18n guide to cover :zero key support in pluralization [ci skip]	Anne Johnson	2017-02-26	1	-2/+8
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #28172 from kamipo/deprecate_supports_migrations	Andrew White	2017-02-26	13	-338/+306
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Deprecate `supports_migrations?` on connection adapters	Ryuta Kamizono	2017-02-27	13	-338/+306
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #28186 from kirs/patch-2	Andrew White	2017-02-26	1	-1/+4
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Refactor connection_pool_test	Kir Shatrov	2017-02-26	1	-1/+4
\|/ / / / / / /
* \| \| \| \| \| \|	[ci skip] Add CHANGELOG entry for #28183	Andrew White	2017-02-26	1	-0/+4
* \| \| \| \| \| \|	Merge pull request #28183 from eugeneius/having_select_column	Andrew White	2017-02-26	2	-1/+3
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Include selects in group query with having clause	Eugene Kenny	2017-02-26	2	-1/+3
* \| \| \| \| \| \| \|	Merge pull request #28106 from jerry-tao/master	Andrew White	2017-02-26	2	-2/+2
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove unused params.	Jerry Tao	2017-02-26	2	-2/+2
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #28176 from kamipo/push_valid_type_up_to_abstract_adapter	Andrew White	2017-02-26	4	-11/+3
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Push `valid_type?` up to abstract adapter	Ryuta Kamizono	2017-02-26	4	-11/+3
* \| \| \| \| \| \|	Merge pull request #28177 from kami-zh/remove-duplicated-private	Andrew White	2017-02-26	1	-102/+100
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Remove duplicated private method	kami-zh	2017-02-26	1	-102/+100
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|