aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix incorrect output from rails routes when using singular resources issue #2...Erick Reyna2016-11-184-12/+51
* Refactor the handling of fallback exception handlersSean Griffin2016-11-171-10/+5
* Merge pull request #27076 from y-yagi/fix_postgresql_array_encodingSean Griffin2016-11-172-4/+4
|\
| * use `force_encoding` instread of `encode!` to avoid `UndefinedConversionError`yuuji.yaginuma2016-11-172-4/+4
* | Merge pull request #26980 from kamipo/respect_new_records_for_collection_prox...Sean Griffin2016-11-176-13/+19
|\ \
| * | Respect new records for `CollectionProxy#uniq`Ryuta Kamizono2016-11-136-13/+19
* | | Call fallback exception handlers with the right exceptionSean Griffin2016-11-172-4/+11
* | | Remove mention of deprecated SafeERB gem from security docs for now, prior se...Vipul A M2016-11-181-1/+1
* | | Merge pull request #27084 from vipulnsward/fix-connection-config-mutationKasper Timm Hansen2016-11-171-3/+3
|\ \ \
| * | | Fix mucking of connection_config leading to issues in prepared_statementsVipul A M2016-11-171-3/+3
|/ / /
* | | Merge pull request #27078 from vipulnsward/fix-pg-prepared-statement-testKasper Timm Hansen2016-11-171-1/+2
|\ \ \
| * | | Fix PG prepared statement testVipul A M2016-11-171-1/+2
|/ / /
* | | Merge pull request #27075 from maclover7/jm-jruby-activejobRafael França2016-11-161-4/+4
|\ \ \
| * | | Make JRUBY_OPTS a global Travis environment variableJon Moss2016-11-161-2/+2
| * | | Enable JRuby testing for Active JobJon Moss2016-11-161-2/+2
|/ / /
* | | 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