aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Revert "fix typo in `match` doc [ci skip]"Jon Moss2016-11-191-1/+1
|/ / / /
* | | | Merge pull request #27114 from y-yagi/fix_typoGuillermo Iguaran2016-11-191-1/+1
|\ \ \ \
| * | | | fix typo in `match` doc [ci skip]yuuji.yaginuma2016-11-201-1/+1
* | | | | Merge pull request #27112 from kamipo/follow-up-27109Kasper Timm Hansen2016-11-192-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix typo s/with/without/Ryuta Kamizono2016-11-202-2/+2
|/ / / /
* | | | Merge pull request #27106 from prathamesh-sonpatki/add-missing-testEileen M. Uchitelle2016-11-191-0/+20
|\ \ \ \
| * | | | Add missing test for singular resource output in rake routesPrathamesh Sonpatki2016-11-191-0/+20
* | | | | Merge pull request #27109 from prathamesh-sonpatki/fix-prepared-statements-testKasper Timm Hansen2016-11-193-5/+9
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix tests for prepared_statements: false and queries hitting `#select_all`Prathamesh Sonpatki2016-11-193-5/+9
| |/ / /
* | | | Merge pull request #27103 from y-yagi/move_changelog_entry_to_appropriate_fileEileen M. Uchitelle2016-11-192-6/+6
|\ \ \ \
| * | | | move CHANGELOG entry to the appropriate file [ci skip]yuuji.yaginuma2016-11-192-6/+6
| |/ / /
* | | | Merge pull request #27057 from kamipo/fix_race_conditionMatthew Draper2016-11-191-6/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Fix the race condition caused by `with_new_connections_blocked`Ryuta Kamizono2016-11-181-8/+4
| |/ /
* | | Merge pull request #27089 from erickueen/erickueen_fix_26606Rafael Mendonça França2016-11-183-13/+19
|\ \ \
| * | | Fix incorrect output from rails routes when using singular resources issue #2...Erick Reyna2016-11-184-12/+51
* | | | Merge pull request #27092 from prathamesh-sonpatki/https-source-bundlerRafael França2016-11-181-0/+5
|\ \ \ \
| * | | | Use secure source for gems referencing "github" in the generated appsPrathamesh Sonpatki2016-11-181-0/+5
* | | | | Merge pull request #27098 from sina-s/fix-unexpected-session-sharingRafael Mendonça França2016-11-183-0/+15
|\ \ \ \ \
| * | | | | Fix `ActionDispatch::IntegrationTest#open_session`Tawan Sierek2016-11-183-0/+15
|/ / / / /
* | | | | Merge pull request #27094 from y-yagi/remove_warnings_from_activejob_test_helperKasper Timm Hansen2016-11-181-4/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | remove Ruby warning from Active Job test helper methodsyuuji.yaginuma2016-11-181-4/+4
|/ / / /
* | | | Merge pull request #26551 from mgpnd/FixContentLengthRafael França2016-11-172-2/+13
|\ \ \ \
| * | | | Fixed CONTENT_LENGTH header in ActionController::TestRequestArtem Rashev2016-11-152-2/+13
| | |/ / | |/| |
* | | | Merge pull request #26981 from kamipo/should_not_except_order_for_existsRafael França2016-11-172-2/+3
|\ \ \ \
| * | | | Should except `:distinct` rather than `:order` for `exists?`Ryuta Kamizono2016-11-092-2/+3
* | | | | Merge pull request #27090 from tomprats/update-preprocessor-documentationRafael França2016-11-171-21/+11
|\ \ \ \ \
| * | | | | Updated Sprockets DocumentationTom Prats2016-11-171-21/+11
| | |_|/ / | |/| | |
* | | | | Merge pull request #27070 from jonhyman/patch-raw-trueRafael França2016-11-171-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Removes 'raw: true' from MemCacheStore#read_multi, per https://github.com/rai...Jonathan Hyman2016-11-161-1/+1
* | | | | 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