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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #31113 from y-yagi/use_e_option_to_specify_environment_in_...	Ryuta Kamizono	2017-11-10	2	-2/+2
\|\
\| *	Use `-e` option to specify the environment in console command [ci skip]	yuuji.yaginuma	2017-11-10	2	-2/+2
* \|	Merge pull request #31115 from y-yagi/add_missing_requires	Ryuta Kamizono	2017-11-10	2	-0/+4
\|\ \
\| * \|	Add missing requires	yuuji.yaginuma	2017-11-10	2	-0/+4
\| \|/
* \|	Merge pull request #31116 from y-yagi/remove_unused_require	Ryuta Kamizono	2017-11-10	1	-1/+0
\|\ \ \| \|/ \|/\|
\| *	Remove unused require	yuuji.yaginuma	2017-11-10	1	-1/+0
\|/
*	Merge pull request #31111 from koic/bump_rubocop_to_0_51_0	Guillermo Iguaran	2017-11-09	4	-4/+4
\|\
\| *	Bump RuboCop to 0.51.0	Koichi ITO	2017-11-10	4	-4/+4
\|/
*	Merge pull request #31027 from PHedkvist/inflector_test_type	Rafael França	2017-11-09	2	-2/+2
\|\
\| *	Fixed typo in test for activesupport parameterize	Pierre Hedkvist	2017-11-01	2	-2/+2
* \|	Merge pull request #30414 from bogdanvlviv/clear-mysql_database_tasks	Rafael França	2017-11-09	3	-139/+5
\|\ \
\| * \|	Simplify implementation of `MySQLDatabaseTasks`	bogdanvlviv	2017-10-30	3	-135/+3
\| * \|	Raise error if unsupported charset for mysql	bogdanvlviv	2017-10-30	2	-7/+5
* \| \|	Merge pull request #25346 from bogdan/correct-tags-count-in-fixtures	Rafael França	2017-11-09	5	-11/+20
\|\ \ \
\| * \| \|	Set counter caches to correct values in fixtures	Bogdan Gusiev	2017-11-08	5	-11/+20
* \| \| \|	Merge pull request #30985 from lugray/attribute_set_in_am	Rafael França	2017-11-09	22	-236/+225
\|\ \ \ \
\| * \| \| \|	Move Attribute and AttributeSet to ActiveModel	Lisa Ugray	2017-11-09	22	-236/+225
\|/ / / /
* \| \| \|	Merge pull request #31088 from neumayr/am-helper-missing-field_with_errors	Rafael França	2017-11-09	4	-3/+104
\|\ \ \ \
\| * \| \| \|	Fix field_error_proc wrap form select optgroup and divider option tag	neumayr	2017-11-09	4	-3/+104
* \| \| \| \|	Merge pull request #31099 from nobu/patch-1	Rafael Mendonça França	2017-11-09	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Use `Dir.mktmpdir`	Nobuyoshi Nakada	2017-11-09	1	-1/+1
\| * \| \| \| \|	Use `Tempfile.create`	Nobuyoshi Nakada	2017-11-09	1	-1/+1
* \| \| \| \| \|	Merge pull request #31081 from rails/allow-include-time-with-zone-range	Andrew White	2017-11-09	5	-4/+46
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Allow `Range#include?` on TWZ ranges	Andrew White	2017-11-08	5	-4/+46
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #31102 from y-yagi/do_not_show_credentials_in_generators_help	Eileen M. Uchitelle	2017-11-09	2	-1/+3
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Do not show credentials in generators help	yuuji.yaginuma	2017-11-09	2	-1/+3
\|/ / / / /
* \| \| \| \|	Should pass `test_no_locks_no_wait` not only on `PostgreSQLAdapter` and `Orac...	Ryuta Kamizono	2017-11-09	1	-8/+5
* \| \| \| \|	Merge pull request #31077 from gsamokovarov/assert-changes-nil	Rafael França	2017-11-09	2	-9/+5
\|\ \ \ \ \
\| * \| \| \| \|	Use plain assert in assert_changes to avoid MT6 refutes	Genadi Samokovarov	2017-11-07	2	-9/+5
* \| \| \| \| \|	Merge pull request #31078 from aeroastro/feature/fix-typo	Rafael França	2017-11-09	1	-2/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix typo on ActionDispatc::HTTP::FilterParameters	Takumasa Ochi	2017-11-07	1	-2/+2
* \| \| \| \| \| \|	Merge pull request #31095 from y-yagi/correctly_kill_the_server_in_ujs_test	Rafael França	2017-11-08	1	-2/+2
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Correctly kill the server started with ujs test	yuuji.yaginuma	2017-11-09	1	-2/+2
* \| \| \| \| \| \| \|	Merge pull request #31091 from yahonda/concurrent_transaction_test_conditions	Rafael França	2017-11-08	1	-15/+13
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Run `ConcurrentTransactionTest` if `supports_transaction_isolation?`	Yasuo Honda	2017-11-08	1	-15/+13
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #31093 from bogdanvlviv/express-console-command-in-the-log	Rafael França	2017-11-08	1	-1/+1
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Change output log about skipping instalation of Active Storage	bogdanvlviv	2017-11-08	1	-1/+1
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #31092 from bogdanvlviv/remove-redundant-passing-skip-acti...	Rafael França	2017-11-08	5	-6/+6
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove redundant passing --skip-active-storage in test cases	bogdanvlviv	2017-11-08	5	-6/+6
\|/ / / / / / /
* \| \| \| \| \| \|	`Mysql2Adapter` should pass `ConcurrentTransactionTest`	Ryuta Kamizono	2017-11-09	1	-1/+1
* \| \| \| \| \| \|	Consolidate redundant `if` and `unless` with the same condition	Ryuta Kamizono	2017-11-09	1	-3/+1
* \| \| \| \| \| \|	Don't expose accessors which are internal used only	Ryuta Kamizono	2017-11-08	2	-3/+6
\| \|_\|_\|/ / / \|/\| \| \| \| \|
* \| \| \| \| \|	Don't expose internal methods in `Preloader::ThroughAssociation`	Ryuta Kamizono	2017-11-08	1	-8/+7
* \| \| \| \| \|	Merge pull request #31086 from y-yagi/use_released_redis_namespace	Matthew Draper	2017-11-08	2	-10/+4
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Use released `redis-namespace` instead of master version	yuuji.yaginuma	2017-11-08	2	-10/+4
* \| \| \| \| \| \|	Merge pull request #31085 from y-yagi/fix_output_of_select_tag_with_include_b...	Ryuta Kamizono	2017-11-08	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Fix output of `select_tag` with `include_blank: true` [ci skip]	yuuji.yaginuma	2017-11-08	1	-1/+1
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #31084 from y-yagi/do_not_run_active_storage_install_when_...	Ryuta Kamizono	2017-11-08	9	-22/+24
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Remove unnecessary migration deletion	yuuji.yaginuma	2017-11-08	5	-19/+0
\| * \| \| \| \| \|	Do not run `active_storage:install` when bundle install is skipped	yuuji.yaginuma	2017-11-08	4	-3/+24
\|/ / / / / /