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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #27078 from vipulnsward/fix-pg-prepared-statement-test	Kasper Timm Hansen	2016-11-17	1	-1/+2
\|\
\| *	Fix PG prepared statement test	Vipul A M	2016-11-17	1	-1/+2
\|/
*	Merge pull request #27075 from maclover7/jm-jruby-activejob	Rafael França	2016-11-16	1	-4/+4
\|\
\| *	Make JRUBY_OPTS a global Travis environment variable	Jon Moss	2016-11-16	1	-2/+2
\| *	Enable JRuby testing for Active Job	Jon Moss	2016-11-16	1	-2/+2
\|/
*	Merge pull request #27072 from maxboisvert/use_named_parameters_in_assert_enq...	Rafael França	2016-11-16	1	-8/+8
\|\
\| *	Use named parameters instead of `assert_valid_keys`	Maxime Boisvert	2016-11-16	1	-8/+8
* \|	Merge pull request #27064 from koic/bump_ruby_versions	Rafael França	2016-11-16	1	-3/+3
\|\ \
\| * \|	Run tests by Ruby 2.2.6 and 2.3.2	Koichi ITO	2016-11-16	1	-3/+3
\| \|/
* \|	Merge pull request #27074 from maclover7/jm-jruby-actionmailer	Rafael França	2016-11-16	1	-0/+5
\|\ \ \| \|/ \|/\|
\| *	Enable JRuby testing for Action Mailer	Jon Moss	2016-11-16	1	-0/+5
\|/
*	docs, add `update_all` example with SQL fragment. [ci skip]	Yves Senn	2016-11-16	1	-0/+3
*	Merge pull request #27056 from kirs/fix-testing-isolation	Guillermo Iguaran	2016-11-15	1	-1/+2
\|\
\| *	Fix testing isolation	Kir Shatrov	2016-11-15	1	-1/+2
* \|	Merge pull request #27058 from maclover7/jm-fix-26904	Jon Moss	2016-11-15	3	-0/+19
\|\ \
\| * \|	Support AC::Parameters for PG HStore	Jon Moss	2016-11-15	3	-0/+19
\|/ /
* \|	Merge pull request #27054 from kamipo/null_relation_calculate	Sean Griffin	2016-11-15	1	-5/+4
\|\ \ \| \|/ \|/\|
\| *	Refactor `NullRelation#calculate`	Ryuta Kamizono	2016-11-16	1	-5/+4
\|/
*	Make sure to bundle json 2.x on CI	Akira Matsuda	2016-11-15	2	-0/+4
*	Merge pull request #27048 from y-yagi/remove_alias_method_chain_from_guide	प्रथमेश Sonpatki	2016-11-15	1	-50/+0
\|\
\| *	remove `alias_method_chain` from guide [ci skip]	yuuji.yaginuma	2016-11-15	1	-50/+0
* \|	Merge pull request #27047 from y-yagi/remove_duplicated_entry	Rafael França	2016-11-14	1	-4/+0
\|\ \ \| \|/ \|/\|
\| *	remove duplicated changelog entry [ci skip]	yuuji.yaginuma	2016-11-15	1	-4/+0
\|/
*	Merge pull request #27046 from conradbeach/fix-typo-layouts-and-rendering-guide	Jon Moss	2016-11-14	1	-1/+1
\|\
\| *	Fix small typo in Layouts and Rendering guide. [ci skip]	Conrad Beach	2016-11-14	1	-1/+1
* \|	Missing require string/filters for `squish`	Akira Matsuda	2016-11-15	1	-0/+2
\|/
*	Merge pull request #27035 from rails/remove-active-support-deprecations	Andrew White	2016-11-14	30	-685/+76
\|\
\| *	Remove deprecated class ActiveSupport::Concurrency::Latch	Andrew White	2016-11-14	2	-25/+4
\| *	Remove deprecated separator argument from parameterize	Andrew White	2016-11-14	5	-44/+6
\| *	Remove deprecated method Numeric#to_formatted_s	Andrew White	2016-11-14	3	-11/+4
\| *	Remove deprecated method alias_method_chain	Andrew White	2016-11-14	3	-263/+4
\| *	Remove deprecated constant MissingSourceFIle	Andrew White	2016-11-14	3	-10/+4
\| *	Remove deprecated Module.qualified_const_get/set/defined?	Andrew White	2016-11-14	5	-190/+5
\| *	Update CHANGELOG	Andrew White	2016-11-13	1	-0/+48
\| *	Remove deprecated :prefix option	Andrew White	2016-11-13	3	-37/+1
\| *	Remove deprecated new_from_hash_copying_default	Andrew White	2016-11-13	2	-16/+0
\| *	Remove deprecated time marshal core_ext file	Andrew White	2016-11-13	1	-3/+0
\| *	Remove deprecated struct core_ext file	Andrew White	2016-11-13	1	-3/+0
\| *	Remove deprecated module method_transplanting file	Andrew White	2016-11-13	1	-3/+0
\| *	Remove deprecated local_constants	Andrew White	2016-11-13	2	-18/+0
\| *	Remove deprecated kernel debugger file	Andrew White	2016-11-13	1	-3/+0
\| *	Remove deprecated namespaced_key	Andrew White	2016-11-13	2	-14/+0
\| *	Remove deprecated set_cache_value	Andrew White	2016-11-13	2	-17/+0
\| *	Remove deprecated escape_key	Andrew White	2016-11-13	2	-14/+0
\| *	Remove deprecated key_file_path	Andrew White	2016-11-13	2	-14/+0
* \|	Merge pull request #27040 from ttanimichi/add-skip-sprockets-to-passthrough-o...	Rafael França	2016-11-14	3	-1/+13
\|\ \
\| * \|	Add `:skip_sprockets` to `Rails::PluginBuilder::PASSTHROUGH_OPTIONS`	Tsukuru Tanimichi	2016-11-14	3	-1/+13
* \| \|	Fix style violations	Rafael Mendonça França	2016-11-14	2	-2/+2
* \| \|	Revert "Merge pull request #25811 from oss92/to_sentence_fallback_string"	Rafael Mendonça França	2016-11-14	3	-20/+3
\|/ /
* \|	Merge pull request #27007 from maclover7/jm-fix-26912	Rafael Mendonça França	2016-11-13	2	-2/+12
\|\ \