aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #27072 from maxboisvert/use_named_parameters_in_assert_enq...Rafael França2016-11-161-8/+8
|\
| * Use named parameters instead of `assert_valid_keys`Maxime Boisvert2016-11-161-8/+8
* | Merge pull request #27064 from koic/bump_ruby_versionsRafael França2016-11-161-3/+3
|\ \
| * | Run tests by Ruby 2.2.6 and 2.3.2Koichi ITO2016-11-161-3/+3
| |/
* | Merge pull request #27074 from maclover7/jm-jruby-actionmailerRafael França2016-11-161-0/+5
|\ \ | |/ |/|
| * Enable JRuby testing for Action MailerJon Moss2016-11-161-0/+5
|/
* docs, add `update_all` example with SQL fragment. [ci skip]Yves Senn2016-11-161-0/+3
* Merge pull request #27056 from kirs/fix-testing-isolationGuillermo Iguaran2016-11-151-1/+2
|\
| * Fix testing isolationKir Shatrov2016-11-151-1/+2
* | Merge pull request #27058 from maclover7/jm-fix-26904Jon Moss2016-11-153-0/+19
|\ \
| * | Support AC::Parameters for PG HStoreJon Moss2016-11-153-0/+19
|/ /
* | Merge pull request #27054 from kamipo/null_relation_calculateSean Griffin2016-11-151-5/+4
|\ \ | |/ |/|
| * Refactor `NullRelation#calculate`Ryuta Kamizono2016-11-161-5/+4
|/
* Make sure to bundle json 2.x on CIAkira Matsuda2016-11-152-0/+4
* Merge pull request #27048 from y-yagi/remove_alias_method_chain_from_guideप्रथमेश Sonpatki2016-11-151-50/+0
|\
| * remove `alias_method_chain` from guide [ci skip]yuuji.yaginuma2016-11-151-50/+0
* | Merge pull request #27047 from y-yagi/remove_duplicated_entryRafael França2016-11-141-4/+0
|\ \ | |/ |/|
| * remove duplicated changelog entry [ci skip]yuuji.yaginuma2016-11-151-4/+0
|/
* Merge pull request #27046 from conradbeach/fix-typo-layouts-and-rendering-guideJon Moss2016-11-141-1/+1
|\
| * Fix small typo in Layouts and Rendering guide. [ci skip]Conrad Beach2016-11-141-1/+1
* | Missing require string/filters for `squish`Akira Matsuda2016-11-151-0/+2
|/
* Merge pull request #27035 from rails/remove-active-support-deprecationsAndrew White2016-11-1430-685/+76
|\
| * Remove deprecated class ActiveSupport::Concurrency::LatchAndrew White2016-11-142-25/+4
| * Remove deprecated separator argument from parameterizeAndrew White2016-11-145-44/+6
| * Remove deprecated method Numeric#to_formatted_sAndrew White2016-11-143-11/+4
| * Remove deprecated method alias_method_chainAndrew White2016-11-143-263/+4
| * Remove deprecated constant MissingSourceFIleAndrew White2016-11-143-10/+4
| * Remove deprecated Module.qualified_const_get/set/defined?Andrew White2016-11-145-190/+5
| * Update CHANGELOGAndrew White2016-11-131-0/+48
| * Remove deprecated :prefix optionAndrew White2016-11-133-37/+1
| * Remove deprecated new_from_hash_copying_defaultAndrew White2016-11-132-16/+0
| * Remove deprecated time marshal core_ext fileAndrew White2016-11-131-3/+0
| * Remove deprecated struct core_ext fileAndrew White2016-11-131-3/+0
| * Remove deprecated module method_transplanting fileAndrew White2016-11-131-3/+0
| * Remove deprecated local_constantsAndrew White2016-11-132-18/+0
| * Remove deprecated kernel debugger fileAndrew White2016-11-131-3/+0
| * Remove deprecated namespaced_keyAndrew White2016-11-132-14/+0
| * Remove deprecated set_cache_valueAndrew White2016-11-132-17/+0
| * Remove deprecated escape_keyAndrew White2016-11-132-14/+0
| * Remove deprecated key_file_pathAndrew White2016-11-132-14/+0
* | Merge pull request #27040 from ttanimichi/add-skip-sprockets-to-passthrough-o...Rafael França2016-11-143-1/+13
|\ \
| * | Add `:skip_sprockets` to `Rails::PluginBuilder::PASSTHROUGH_OPTIONS`Tsukuru Tanimichi2016-11-143-1/+13
* | | Fix style violationsRafael Mendonça França2016-11-142-2/+2
* | | Revert "Merge pull request #25811 from oss92/to_sentence_fallback_string"Rafael Mendonça França2016-11-143-20/+3
|/ /
* | Merge pull request #27007 from maclover7/jm-fix-26912Rafael Mendonça França2016-11-132-2/+12
|\ \
| * | Don't error on an empty CONTENT_TYPEJon Moss2016-11-102-2/+12
* | | Merge pull request #26222 from vipulnsward/26134-fixRafael França2016-11-133-7/+18
|\ \ \
| * | | Format and send logs to logger.fatal from DebugExceptions instead of calling ...Vipul A M2016-11-123-7/+18
* | | | Merge pull request #27030 from kamipo/avoid_build_preloaderRafael França2016-11-131-2/+3
|\ \ \ \
| * | | | Avoid `build_preloader` if preloading is not neededRyuta Kamizono2016-11-141-2/+3
| | |_|/ | |/| |