aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Remove unused `LOST_CONNECTION_ERROR_MESSAGES`Ryuta Kamizono2016-01-311-6/+0
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | `LOST_CONNECTION_ERROR_MESSAGES` was added by f384582. But currently unused from anywhere.
* | | | | | | Merge pull request #23347 from yui-knk/explicitly_define_columns_as_interfaceRafael França2016-01-301-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Explicitly define `columns` method as an interface
| * | | | | | | Explicitly define `columns` method as an interfaceyui-knk2016-01-301-1/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActiveRecord::ConnectionAdapters::SchemaStatements#columns` is defined here as an interface method here. So changes to raise `NotImplementedError` same as `tables`, `views` ...etc.
* | | | | | | Merge pull request #23342 from y-yagi/remove_unused_variableRafael França2016-01-301-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | remove unused variable from render test
| * | | | | | | remove unused variable from render testyuuji.yaginuma2016-01-301-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the following warning. ``` rails/actionpack/test/controller/render_test.rb:278: warning: assigned but unused variable - response ```
* | | | | | | Merge pull request #23343 from y-yagi/remove_unused_requireRafael França2016-01-301-1/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | remove unused require
| * | | | | | | remove unused requireyuuji.yaginuma2016-01-301-1/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | `with_indifferent_access` had been used in `assigns` method, but has been removed in ca83436.
* | | | | | | 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`
| * | | | | | | remove unnecessary gsub for `action_cable_meta_tag`yuuji.yaginuma2016-01-301-1/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the specified `skip_action_cable` option, so as not to output the `action_cable_meta_tag` in template, gsub is unnecessary. ref: https://github.com/rails/rails/blob/master/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt#L6..L8
* | | | | | | Merge pull request #23346 from kamipo/refactor_oid_money_precisionRafael França2016-01-302-9/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Refactor `OID::Money.precision`
| * | | | | | Refactor `OID::Money.precision`Ryuta Kamizono2016-01-302-9/+5
| |/ / / / /
* / / / / / Handle response_body= when body is nileileencodes2016-01-302-0/+17
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are some cases when the `body` in `response_body=` can be set to nil. One of those cases is in `actionpack-action_caching` which I found while upgrading it for Rails 5. It's not possible to run `body.each` on a `nil` body so we have to return after we run `response.reset_body!`.
* | | | | Merge pull request #23317 from rfmanuel/after-bundle-in-rails-plugin-templateRafael França2016-01-294-2/+42
|\ \ \ \ \ | | | | | | | | | | | | Add an after_bundle callback in Rails plugin templates
| * | | | | 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]
| * | | | | | Add additional documentation on Headers#[] [ci skip]Tawan Sierek2016-01-291-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue #16519 covers confusion potentially caused by how HTTP headers, that contain underscores in their names, are retrieved through `ActionDispatch::Http::Headers#[]`. This confusion has its origin in how a CGI maps HTTP header names to variable names. Even though underscores in header names are rarely encountered, they are valid according to RFC822 [1]. Nonetheless CGI like variable names, as requested by the Rack specfication, will only contain underscores and therefore the original header name cannot be recovered after the Rack server passed on the environemnt hash. Please, see also the disscussion on StackOverflow [2], which also links to an explaination in the nginx documentation [3]. [1] http://www.ietf.org/rfc/rfc822.txt [2] http://stackoverflow.com/questions/22856136/why-underscores-are-forbidden-in-http-header-names [3] https://www.nginx.com/resources/wiki/start/topics/tutorials/config_pitfalls/#missing-disappearing-http-headers
* | | | | | | Use a gentler disconnectMatthew Draper2016-01-301-2/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | The detach used by close! seems to be making EM very sad on Travis.
* | | | | | Don't bother stopping EM between testsMatthew Draper2016-01-301-38/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's not strictly necessary, and maybe this will help with the current test failure.
* | | | | | 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 logging
| * | | | | | remove require loggingKesha Antonov2016-01-291-2/+0
|/ / / / / /
* | | | | | Merge pull request #23305 from matthewd/concurrent-take-2Matthew Draper2016-01-3031-117/+738
|\ \ \ \ \ \ | | | | | | | | | | | | | | EventMachine -> concurrent-ruby, take two
| * | | | | | Keep the socket reference after closeMatthew Draper2016-01-301-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We may still try to send to it.
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, address the possibility of the listen thread dying and needing to be respawned. As a bonus, we now defer construction of the thread until we are first given something to monitor.
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | They're all at risk of races on the first requests.
| * | | | | | 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
| | | | | | | | | | | | | | | | | | These methods are more expensive than the alternatives, and have strange semantics that are likely undesirable.
* | | | | | Merge pull request #23330 from prathamesh-sonpatki/fix-testsMatthew Draper2016-01-291-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix broken number_to_currency conversion tests
| * | | | | | 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.0
| * | | | | | Remove `limit: 11` as backward-compatibility with Rails 2.0Ryuta Kamizono2016-01-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integer limit as a byte size was introduced from Rails 2.1. `limit: 11` is not a byte size, but take care for backward-compatibility with Rails 2.0 (a892af6). Integer limit out of range should be allowed to raise by #6349. I think we should remove this backward-compatibility.
* | | | | | | Merge pull request #23188 from jcoleman/ar-connection-execute-docs-clarificationRafael França2016-01-292-1/+7
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Clarify DatabaseStatements#execute docs re: memory usage.
| * | | | | | 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 negativity of a number
| * | | | | | | Change number_to_currency behavior for checking negativityPrathamesh Sonpatki2016-01-293-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Instead of using `to_f.phase`, just use `to_f.negative`?. - This change works same for all cases except when number is "-0.0". -0.0.to_f.negative? => false -0.0.to_f.phase? => pi - So -0.0 will be treated as positive from now onwards. - So this change reverts changes from https://github.com/rails/rails/pull/6512. - But it should be acceptable as we could not find any currency which supports negative zeros.
* | | | | | | | Merge pull request #23296 from radar/cache-fragment-name-optionsRafael Mendonça França2016-01-291-2/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract options for cache_fragment_name method to allow expires_in on cache method
| * | | | | | | | Slice out options for cache_fragment_name explicitlyRyan Bigg2016-01-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows expire_in (and other options) to be passed to the cache method
* | | | | | | | | 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 stores
| * | | | | | | | | restore ability to pass extra options to cache storesDave Gynn2015-12-263-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `cache` helper methods should pass any extra options to the cache store. For example :expires_in would be a valid option if memcache was the cache store. The change in commit da16745 broke the ability to pass any options other than :skip_digest and :virtual_path. This PR restores that functionality and adds a test for it.
* | | | | | | | | | Merge pull request #23326 from fgo/patch-16Rafael França2016-01-281-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | Getting Started Guide: Update Ruby version to 2.3.0p0 [ci skip]
| * | | | | | | | | 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.md
| * | | | | | | | | Docs review of api_app.mdJon Moss2016-01-281-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass through correcting api_app.md. The list of included modules and middleware was tested through a sample API app, and was listed in the same order an end user would see in their terminal. [ci skip]