aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #23347 from yui-knk/explicitly_define_columns_as_interfaceRafael França2016-01-301-1/+3
|\
| * Explicitly define `columns` method as an interfaceyui-knk2016-01-301-1/+3
* | Merge pull request #23342 from y-yagi/remove_unused_variableRafael França2016-01-301-1/+1
|\ \
| * | remove unused variable from render testyuuji.yaginuma2016-01-301-1/+1
| |/
* | Merge pull request #23343 from y-yagi/remove_unused_requireRafael França2016-01-301-1/+0
|\ \
| * | remove unused requireyuuji.yaginuma2016-01-301-1/+0
| |/
* | Allow failures for Action Cable testsRafael Mendonça França2016-01-301-0/+1
* | Merge pull request #23351 from y-yagi/remove_gsub_for_action_cable_meta_tagRafael França2016-01-301-1/+0
|\ \
| * | remove unnecessary gsub for `action_cable_meta_tag`yuuji.yaginuma2016-01-301-1/+0
| |/
* | Merge pull request #23346 from kamipo/refactor_oid_money_precisionRafael França2016-01-302-9/+5
|\ \
| * | Refactor `OID::Money.precision`Ryuta Kamizono2016-01-302-9/+5
| |/
* / Handle response_body= when body is nileileencodes2016-01-302-0/+17
|/
* Merge pull request #23317 from rfmanuel/after-bundle-in-rails-plugin-templateRafael França2016-01-294-2/+42
|\
| * Implemented pull request changes.Ryan Manuel2016-01-292-10/+5
| * Update doc with appropriate issue and pull request versionsRyan Manuel2016-01-282-2/+2
| * Add an after_bundle callback in Rails plugin templatesRyan Manuel2016-01-285-2/+47
* | Merge pull request #23338 from tawan/update-doc-request-headers-accessJon Moss2016-01-291-1/+15
|\ \
| * | Add additional documentation on Headers#[] [ci skip]Tawan Sierek2016-01-291-1/+15
* | | Use a gentler disconnectMatthew Draper2016-01-301-2/+2
|/ /
* | Don't bother stopping EM between testsMatthew Draper2016-01-301-38/+3
* | Intervene on change_table as well as create_tableMatthew Draper2016-01-301-0/+13
* | Merge pull request #23336 from kesha-antonov/patch-1Rafael França2016-01-291-2/+0
|\ \
| * | remove require loggingKesha Antonov2016-01-291-2/+0
|/ /
* | Merge pull request #23305 from matthewd/concurrent-take-2Matthew Draper2016-01-3031-117/+738
|\ \
| * | Keep the socket reference after closeMatthew Draper2016-01-301-3/+2
| * | Reduce the client count, in hope of a more consistent testMatthew Draper2016-01-301-3/+3
| * | Be more patient while gathering the expected responsesMatthew Draper2016-01-301-4/+3
| * | Handle more IO errors (especially, ECONNRESET)Matthew Draper2016-01-303-21/+78
| * | Add a couple of tests that connect with a WS clientMatthew Draper2016-01-304-0/+257
| * | Synchronize the lazy setters in ServerMatthew Draper2016-01-305-15/+47
| * | Fix arguments to on_closeMatthew Draper2016-01-302-5/+3
| * | Revert "Revert "Eliminate the EventMachine dependency""Matthew Draper2016-01-3027-106/+385
|/ /
* | Don't recommend using `ActiveRecord::Base[]`Sean Griffin2016-01-291-3/+0
* | Merge pull request #23330 from prathamesh-sonpatki/fix-testsMatthew Draper2016-01-291-0/+2
|\ \
| * | Fix broken number_to_currency testsPrathamesh Sonpatki2016-01-291-0/+2
|/ /
* | Merge pull request #23252 from kamipo/remove_limit_11Rafael França2016-01-291-1/+0
|\ \
| * | Remove `limit: 11` as backward-compatibility with Rails 2.0Ryuta Kamizono2016-01-271-1/+0
* | | Merge pull request #23188 from jcoleman/ar-connection-execute-docs-clarificationRafael França2016-01-292-1/+7
|\ \ \
| * | | Clarify DatabaseStatements#execute docs re: memory usage.James Coleman2016-01-222-1/+7
* | | | Merge pull request #23329 from prathamesh-sonpatki/fix-23320Rafael França2016-01-293-6/+16
|\ \ \ \
| * | | | Change number_to_currency behavior for checking negativityPrathamesh Sonpatki2016-01-293-6/+16
* | | | | Merge pull request #23296 from radar/cache-fragment-name-optionsRafael Mendonça França2016-01-291-2/+3
|\ \ \ \ \
| * | | | | Slice out options for cache_fragment_name explicitlyRyan Bigg2016-01-281-1/+2
* | | | | | Merge pull request #22800 from dgynn/pr_cache_helper_optionsRafael Mendonça França2016-01-293-1/+16
|\ \ \ \ \ \
| * | | | | | restore ability to pass extra options to cache storesDave Gynn2015-12-263-1/+16
* | | | | | | Merge pull request #23326 from fgo/patch-16Rafael França2016-01-281-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Getting Started Guide: Update Ruby version to 2.3.0p0Francis Go2016-01-291-1/+1
|/ / / / / /
* | | | | | Merge pull request #23323 from maclover7/api-app-docsRafael França2016-01-281-16/+19
|\ \ \ \ \ \
| * | | | | | Docs review of api_app.mdJon Moss2016-01-281-16/+19
* | | | | | | speed up accept header parsing a bit.Aaron Patterson2016-01-281-8/+11
|/ / / / / /