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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #28182 from y-yagi/show_correct_rails_commands	Kasper Timm Hansen	2017-03-09	8	-18/+47
\|\
\| *	Show correct commands in help	yuuji.yaginuma	2017-03-03	8	-18/+47
* \|	[ci skip] Document read_encrypted_secrets config.	Kasper Timm Hansen	2017-03-09	1	-0/+8
* \|	Merge pull request #28351 from kamipo/deprecate_schema_migrations_table_name	Rafael Mendonça França	2017-03-09	3	-0/+13
\|\ \
\| * \|	Deprecate `Migrator.schema_migrations_table_name`	Ryuta Kamizono	2017-03-09	3	-0/+13
* \| \|	Merge pull request #28354 from kamipo/fix_select_with_block_and_dirty_target	Eileen M. Uchitelle	2017-03-09	3	-2/+14
\|\ \ \
\| * \| \|	Fix select with block doesn't return newly built records in has_many association	Ryuta Kamizono	2017-03-09	3	-2/+14
* \| \| \|	Merge branch 'refactor-system-test-driver'	eileencodes	2017-03-09	9	-91/+64
\|\ \ \ \
\| * \| \| \|	Call system test driver per-instance rather than globally	eileencodes	2017-03-09	7	-42/+36
\| * \| \| \|	Refactor system test driver/browser	eileencodes	2017-03-09	6	-56/+35
\|/ / / /
* / / /	force UTF-8 as external encoding in guides generation [ci skip]	Xavier Noria	2017-03-09	1	-3/+16
\|/ / /
* \| \|	Merge pull request #28340 from k3rni/document-am-default-url-options	Jon Moss	2017-03-08	1	-0/+3
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Document using `default_url_options` in an ActionMailer class.	Krzysztof Zych	2017-03-08	1	-0/+3
* \| \|	Merge pull request #28336 from tjschuck/test_delegated_params_methods	Rafael França	2017-03-08	1	-0/+63
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Tests for delegated public methods on AC::Parameters	T.J. Schuck	2017-03-07	1	-0/+63
* \| \|	Merge pull request #28338 from y-yagi/use_appropriate_type_in_generators_test	Kasper Timm Hansen	2017-03-08	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Use appropriate type in generators test	yuuji.yaginuma	2017-03-08	1	-1/+1
* \| \|	params --> parameters	Jon Moss	2017-03-07	1	-2/+2
* \| \|	Merge pull request #28334 from tjschuck/document_delegated_params_methods	Jon Moss	2017-03-07	1	-0/+71
\|\ \ \
\| * \| \|	Document delegated public methods on AC::Parameters	T.J. Schuck	2017-03-07	1	-0/+71
\|/ / /
* \| \|	Merge pull request #28289 from maicher/master	Vipul A M	2017-03-07	1	-2/+18
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Improve foreign key description in guides [ci skip]	Krzysztof Maicher	2017-03-06	1	-2/+18
* \| \|	Check whether `Rails.application` defined before calling it	Andrew White	2017-03-07	2	-1/+11
* \| \|	Merge pull request #28326 from y-yagi/remove_on_option_that_does_not_exist	Vipul A M	2017-03-07	1	-2/+2
\|\ \ \
\| * \| \|	Remove `:on` option that does ot exist [ci skip]	yuuji.yaginuma	2017-03-07	1	-2/+2
* \| \| \|	CI against jruby-9.1.8.0	Akira Matsuda	2017-03-07	1	-3/+3
* \| \| \|	Merge pull request #28320 from y-yagi/fix_typo_titleize	Jon Moss	2017-03-06	1	-2/+2
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Fix typo `titlelize` -> `titleize` [ci skip]	yuuji.yaginuma	2017-03-07	1	-2/+2
\|/ / /
* \| \|	[ci skip] 🎬 expensive: take two	Kasper Timm Hansen	2017-03-06	1	-1/+1
* \| \|	Update `titlelize` regex to allow apostrophes	Andrew White	2017-03-06	3	-1/+18
* \| \|	Merge pull request #28257 from yahonda/app_generators_use_oracle_enhanced	Andrew White	2017-03-06	2	-5/+6
\|\ \ \
\| * \| \|	Update `database.yml` when `rails new <new_app> -d oracle` specified	Yasuo Honda	2017-03-02	2	-5/+6
* \| \| \|	Add CHANGELOG entry for #28250	Andrew White	2017-03-06	1	-0/+10
* \| \| \|	Merge pull request #28250 from tzabaman/fix_malformed_asset_url_in_ac_renderer	Andrew White	2017-03-06	2	-0/+15
\|\ \ \ \
\| * \| \| \|	Fix malformed asset_url when rendering template with ActionController::Renderer	Giorgos Vrettos	2017-03-06	2	-0/+15
* \| \| \| \|	Merge pull request #28305 from kamipo/extract_schema_migration_all_versions	Andrew White	2017-03-06	3	-4/+8
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Extract `SchemaMigration.all_versions`	Ryuta Kamizono	2017-03-06	3	-4/+8
* \| \| \| \|	Merge pull request #28295 from kamipo/fix_deserialize_with_json_array	Andrew White	2017-03-06	3	-1/+17
\|\ \ \ \ \
\| * \| \| \| \|	Fix `deserialize` with JSON array	Ryuta Kamizono	2017-03-06	3	-1/+17
\| \|/ / / /
* \| \| \| \|	Merge pull request #28301 from y-yagi/fix_direct_with_params_example	Jon Moss	2017-03-05	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Fix `direct` with params example [ci skip]	yuuji.yaginuma	2017-03-06	1	-1/+1
* \| \| \| \|	Merge pull request #28296 from kamipo/fix_ci_failure	Jon Moss	2017-03-05	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	Fix CI failure due to contain <U+2028>	Ryuta Kamizono	2017-03-06	1	-2/+2
\|/ / / / /
* \| \| \| \|	Merge pull request #28293 from kamipo/remove_useless_migrator_schema_migratio...	Eileen M. Uchitelle	2017-03-05	3	-12/+8
\|\ \ \ \ \
\| * \| \| \| \|	Remove useless `Migrator.schema_migrations_table_name`	Ryuta Kamizono	2017-03-05	3	-12/+8
\| \|/ / / /
* \| \| \| \|	Merge pull request #28259 from ChakreshwarSharma/redirect_to_doc	Vipul A M	2017-03-05	1	-0/+3
\|\ \ \ \ \
\| * \| \| \| \|	[ci skip] Use return with redirect_to	ChakreshwarSharma	2017-03-04	1	-0/+3
* \| \| \| \| \|	Merge pull request #28264 from y-yagi/do_not_take_screenshot_if_driver_does_n...	Eileen M. Uchitelle	2017-03-05	2	-1/+30
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Do not take screenshot if driver does not support screenshot	yuuji.yaginuma	2017-03-04	2	-1/+30
* \| \| \| \| \| \|	Revert "Add a changelog entry for #28284 [ci skip]"	eileencodes	2017-03-05	1	-6/+0