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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #31137 from y-yagi/make_sidekiq_and_resque_integration_tes...	Ryuta Kamizono	2017-11-13	3	-11/+9
\|\
\| *	Make sidekiq and resque integration tests work in CI	yuuji.yaginuma	2017-11-13	3	-9/+5
\| *	Return a non zero code when can not connect to redis in CI	yuuji.yaginuma	2017-11-13	2	-2/+4
* \|	Add new error class `StatementTimeout` which will be raised when statement ti...	Ryuta Kamizono	2017-11-13	6	-2/+73
* \|	Merge pull request #31139 from avneetmalhotra/touch_callback_documentation_fix	Ryuta Kamizono	2017-11-13	1	-1/+1
\|\ \
\| * \|	Move touch method from Skipping Callbacks section to Running Callbacks sectio...	Avneet Singh Malhotra	2017-11-13	1	-1/+1
* \| \|	Merge pull request #30893 from y-yagi/verify_credentials_format_before_saving	Kasper Timm Hansen	2017-11-13	2	-1/+15
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Verify credentials format before saving	yuuji.yaginuma	2017-11-13	2	-1/+15
* \| \|	Action Cable: run Redis tests against a default config without a password	Jeremy Daer	2017-11-13	2	-3/+22
\| \|/ \|/\|
* \|	Merge pull request #30773 from y-yagi/fix_30765	Eileen M. Uchitelle	2017-11-12	3	-1/+36
\|\ \
\| * \|	Make automatically synchronize test schema work inside engine	yuuji.yaginuma	2017-10-02	3	-1/+36
* \| \|	Merge pull request #30791 from felipecvo/nested-attributes-doc	Eileen M. Uchitelle	2017-11-12	1	-0/+12
\|\ \ \
\| * \| \|	Add update_only example to AR nested attributes doc [ci_skip]	Felipe Oliveira	2017-10-03	1	-0/+12
* \| \| \|	Revert displaying master key generation info on `rails new`.	Kasper Timm Hansen	2017-11-12	3	-23/+20
* \| \| \|	Deprecate encrypted secrets in favor of credentials.	Kasper Timm Hansen	2017-11-12	6	-167/+50
* \| \| \|	Merge pull request #30770 from y-yagi/do_not_create_credential_in_dummy_appli...	Kasper Timm Hansen	2017-11-12	3	-2/+5
\|\ \ \ \
\| * \| \| \|	Do not create credentials in dummy application	yuuji.yaginuma	2017-10-02	3	-2/+5
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #31131 from y-yagi/remove_unused_requires	Ryuta Kamizono	2017-11-12	1	-2/+0
\|\ \ \ \
\| * \| \| \|	Remove unused require	yuuji.yaginuma	2017-11-12	1	-2/+0
* \| \| \| \|	Raise `TransactionTimeout` when lock wait timeout exceeded for PG adapter	Ryuta Kamizono	2017-11-11	4	-3/+35
* \| \| \| \|	Should test actual error which is raised from the database	Ryuta Kamizono	2017-11-11	1	-1/+23
\|/ / / /
* \| \| \|	Add missing autoload `Type` (#31123)	Ryuta Kamizono	2017-11-11	19	-17/+2
* \| \| \|	Relation merging should keep joining order	Ryuta Kamizono	2017-11-11	2	-10/+17
* \| \| \|	Add missing require "active_support/core_ext/hash/indifferent_access"	Ryuta Kamizono	2017-11-10	1	-0/+2
* \| \| \|	Fix random CI failure due to non-deterministic sorting order	Ryuta Kamizono	2017-11-10	1	-1/+1
* \| \| \|	Consolidate duplicated `to_ary`/`to_a` definitions in `Relation` and `Collect...	Ryuta Kamizono	2017-11-10	3	-6/+9
* \| \| \|	Ensure `apply_join_dependency` for subqueries in `from` and `where`	Ryuta Kamizono	2017-11-10	3	-0/+19
* \| \| \|	:scissors:	Ryuta Kamizono	2017-11-10	1	-2/+2
* \| \| \|	Adjust blank lines	Ryuta Kamizono	2017-11-10	4	-4/+5
* \| \| \|	Merge pull request #31065 from bogdan/cleanup-cache-key	Andrew White	2017-11-10	1	-26/+11
\|\ \ \ \
\| * \| \| \|	Remove code duplication in ActiveSupport::Cache	Bogdan Gusiev	2017-11-09	1	-26/+11
* \| \| \| \|	Merge pull request #31119 from y-yagi/add_missing_requires	Ryuta Kamizono	2017-11-10	1	-0/+1
\|\ \ \ \ \
\| * \| \| \| \|	Add missing requires	yuuji.yaginuma	2017-11-10	1	-0/+1
\|/ / / / /
* \| \| \| \|	Remove useless preloader classes	Ryuta Kamizono	2017-11-10	10	-104/+15
* \| \| \| \|	Merge pull request #31118 from aycabta/fix-rdoc-url	Akira Matsuda	2017-11-10	2	-4/+4
\|\ \ \ \ \
\| * \| \| \| \|	Use new Rake URL of Ruby core [ci skip]	aycabta	2017-11-10	1	-1/+1
\| * \| \| \| \|	Use new RDoc URL of Ruby core [ci skip]	aycabta	2017-11-10	1	-3/+3
\|/ / / / /
* \| \| \| \|	Merge pull request #31114 from y-yagi/fix_ruby_warnings_in_active_model	Ryuta Kamizono	2017-11-10	2	-3/+3
\|\ \ \ \ \
\| * \| \| \| \|	Fix "warning: assigned but unused variable - name"	yuuji.yaginuma	2017-11-10	1	-1/+1
\| * \| \| \| \|	Fix "warning: instance variable @attributes not initialized"	yuuji.yaginuma	2017-11-10	1	-2/+2
* \| \| \| \| \|	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