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

	Commit message (Expand)	Author	Age	Files	Lines
*	Support multiple versions in release announcement.	Kasper Timm Hansen	2017-07-22	2	-51/+67
*	Add task to verify a release.	Kasper Timm Hansen	2017-07-22	2	-1/+25
*	Merge pull request #29870 from kamipo/use_true_false_literals	Sean Griffin	2017-07-22	2	-14/+4
\|\
\| *	Use `TRUE` and `FALSE` boolean literals for MySQL	Ryuta Kamizono	2017-07-20	2	-14/+6
* \|	Merge pull request #29858 from y-yagi/use_argument_error_instead_of_own_error...	Rafael França	2017-07-21	2	-19/+18
\|\ \
\| * \|	Use `ArgumentError` instead of own error class	yuuji.yaginuma	2017-07-20	2	-19/+18
\| \|/
* \|	Merge pull request #29869 from kamipo/make_type_map_to_private	Rafael França	2017-07-21	9	-31/+28
\|\ \
\| * \|	Make `type_map` to private because it is only used in the connection adapter	Ryuta Kamizono	2017-07-20	9	-31/+28
\| \|/
* \|	Merge pull request #29884 from padi/update_rails_5_upgrade_guide	Rafael França	2017-07-21	2	-2/+12
\|\ \
\| * \|	Suppress documentation for content_tag_for and div_for since they were remove...	Marc Rendl Ignacio	2017-07-21	1	-2/+2
\| * \|	Updates Rails upgrade guide for 4.2 to 5.0 regarding the removal of `ActionVi...	Marc Rendl Ignacio	2017-07-21	1	-0/+10
* \| \|	Merge pull request #29885 from freeletics/fix-false-positive-test	Rafael França	2017-07-21	1	-11/+11
\|\ \ \
\| * \| \|	Fix false positive test related to wrong app root path.	Wojciech Wnętrzak	2017-07-21	1	-11/+11
* \| \| \|	Merge pull request #29855 from lugray/has_one_destroyed_by_association	Rafael França	2017-07-21	3	-0/+42
\|\ \ \ \
\| * \| \| \|	Match destroyed_by_association for has_one to has_many	Lisa Ugray	2017-07-21	3	-0/+42
* \| \| \| \|	Merge pull request #29732 from kirs/frozen-activerecord	Rafael França	2017-07-21	678	-11/+1367
\|\ \ \ \ \
\| * \| \| \| \|	Reset column information after schema changed	yuuji.yaginuma	2017-07-20	2	-0/+4
\| * \| \| \| \|	Use frozen-string-literal in ActiveRecord	Kir Shatrov	2017-07-19	677	-11/+1363
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Revert "Extract `bind_param` and `bind_attribute` into `ActiveRecord::TestCase`"	Sean Griffin	2017-07-21	13	-46/+56
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Merge pull request #29882 from y-yagi/fix_ujs_test_postprocessing	Kasper Timm Hansen	2017-07-21	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Remove log directory in test postprocessing	yuuji.yaginuma	2017-07-21	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #29872 from padi/add_jquery_vendor_for_ujs_testing	Guillermo Iguaran	2017-07-20	2	-1/+9832
\|\ \ \ \
\| * \| \| \|	Add jQuery to test vendor files	Marc Rendl Ignacio	2017-07-20	2	-1/+9832
\| \|/ / /
* \| \| \|	Merge pull request #29851 from printercu/patch-1	Eileen M. Uchitelle	2017-07-20	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Make `rails yarn:install` ignore dev dependencies	printercu	2017-07-19	1	-1/+1
\| \|/ /
* \| \|	Merge pull request #29854 from assain/add_metadata_to_message_verifier	Kasper Timm Hansen	2017-07-19	2	-6/+48
\|\ \ \
\| * \| \|	add metadata support to message verifier	Assain	2017-07-19	2	-6/+48
\|/ / /
* / /	Move back to @matthewd's close io fixed rb-inotify.	Kasper Timm Hansen	2017-07-19	2	-2/+13
\|/ /
* \|	Merge pull request #29599 from assain/add_meta_data_to_message_encryptor	Kasper Timm Hansen	2017-07-19	4	-6/+192
\|\ \
\| * \|	Add expires_at, expires_in, and purpose meta_data to messages.	Assain	2017-07-19	4	-6/+192
\|/ /
* \|	Merge pull request #29843 from y-yagi/fix_ruby_warnings	Kasper Timm Hansen	2017-07-19	1	-2/+2
\|\ \
\| * \|	Fix `warning: circular argument reference`	yuuji.yaginuma	2017-07-19	1	-2/+2
* \| \|	Merge pull request #29844 from kamipo/create_rails_user_on_travis_ci	Kasper Timm Hansen	2017-07-19	1	-0/+4
\|\ \ \
\| * \| \|	Create `rails@localhost` user on travis ci	Ryuta Kamizono	2017-07-19	1	-0/+4
\| \|/ /
* \| \|	Merge pull request #29845 from willnet/doc-rails-ujs	Guillermo Iguaran	2017-07-18	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	[ci skip]Replace jquery-ujs with rails-ujs	willnet	2017-07-19	1	-1/+1
\|/ /
* \|	Merge pull request #29033 from kamipo/make_preload_query_to_prepared_statements	Sean Griffin	2017-07-18	4	-4/+4
\|\ \
\| * \|	Make preload query to preparable	Ryuta Kamizono	2017-07-07	4	-4/+4
* \| \|	Merge pull request #29840 from kamipo/fix_type_casting_time_for_mariadb	Sean Griffin	2017-07-18	1	-1/+0
\|\ \ \
\| * \| \|	Fix type casting a time for MariaDB	Ryuta Kamizono	2017-07-19	1	-1/+0
\|/ / /
* \| \|	Merge pull request #29775 from yui-knk/assign_once	Sean Griffin	2017-07-18	1	-2/+2
\|\ \ \
\| * \| \|	Assign `content_type` only once	yui-knk	2017-07-13	1	-2/+2
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #29780 from MaxLap/fix_unscope_where_column_with_or	Sean Griffin	2017-07-18	3	-2/+34
\|\ \ \
\| * \ \	Merge branch 'master' into fix_unscope_where_column_with_or	Sean Griffin	2017-07-18	212	-582/+1480
\| \|\ \ \ \| \|/ / / \|/\| \| \|
* \| \| \|	Merge pull request #29785 from cswilliams/rescue_postgres_connection_errors_o...	Sean Griffin	2017-07-18	1	-0/+1
\|\ \ \ \
\| * \| \| \|	Catch postgres connection errors when trying to dealloc the statement pool	Chris Williams	2017-07-13	1	-0/+1
* \| \| \| \|	Merge pull request #29815 from posthumanism/add-except-option	Sean Griffin	2017-07-18	3	-15/+440
\|\ \ \ \ \
\| * \| \| \| \|	Add `except` option for ActiveJob::TestHelper methods	posthumanism	2017-07-18	3	-15/+440
* \| \| \| \| \|	Merge pull request #29834 from kamipo/fix_unscoping_default_scope_with_sti_as...	Sean Griffin	2017-07-18	6	-3/+39
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix unscoping `default_scope` for `Preloader`	Ryuta Kamizono	2017-07-19	2	-1/+13