Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove magic comment in generated `schema.rb` | Ryuta Kamizono | 2016-05-12 | 2 | -8/+0 |
| | | | | | Rails 5.0 has been dropped Ruby 1.9 support. I think no need magic comment anymore. | ||||
* | remove_connection should not remove parent connection | Arthur Neves | 2016-05-11 | 2 | -1/+9 |
| | | | | | | When calling remove_connection in a subclass, that should not fallback to the parent, otherwise it will remove the parent connection from the handler. | ||||
* | Merge pull request #24977 from fgo/patch-19 | Arthur Nogueira Neves | 2016-05-11 | 1 | -0/+1 |
|\ | | | | | Getting Started Guide: Add invoke test_unit to files table [ci skip] | ||||
| * | Getting Started Guide: Add invoke test_unit to files table [ci skip] | Francis Go | 2016-05-12 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #24974 from mohitnatoo/arrayinquirer-any-definition | Vipul A M | 2016-05-11 | 1 | -2/+4 |
|\ | | | | | Added clarity to documentation of ArrayInquirer#any? [ci skip] | ||||
| * | - Added clarity to documentation of ArrayInquirer#any? [ci skip] | Mohit Natoo | 2016-05-11 | 1 | -2/+4 |
| | | | | | | | | | | | | - Added clarity to documentation of ArrayInquirer#any? [ci skip] - Added clarity to documentation of ArrayInquirer#any? [ci skip] | ||||
* | | Merge pull request #24975 from fgo/patch-18 | प्रथमेश Sonpatki | 2016-05-11 | 1 | -1/+1 |
|\ \ | | | | | | | Getting Started Guide: Add channels and jobs to purpose table [ci skip] | ||||
| * | | Getting Started Guide: Add channels and jobs to app purpose table [ci skip] | Francis Go | 2016-05-12 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #24912 from prathamesh-sonpatki/api-fix-response-format | Santiago Pastorino | 2016-05-11 | 2 | -40/+62 |
|\ \ | |/ |/| | API only apps: Preserve request format for HTML requests too | ||||
| * | API only apps: Preserve request format for HTML requests too | Prathamesh Sonpatki | 2016-05-11 | 2 | -40/+62 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Earlier we were responding with JSON format for HTML requests in a API app. - Now we will respond with HTML format for such requests in API apps. - Also earlier we were not testing the API app's JSON requests properly. We were actually sending HTML requests. Now we send correct JSON requests. Also added more test coverage. - Based on the discussion from this commit - https://github.com/rails/rails/commit/05d89410bf97d0778e78558db3c9fed275f8a614. [Prathamesh Sonpatki, Jorge Bejar] | ||||
* | | Merge pull request #24971 from arthurnn/arthurnn/dont_cache_specification_name | Arthur Nogueira Neves | 2016-05-11 | 2 | -2/+11 |
|\ \ | | | | | | | Dont cache the conn_spec_name when empty | ||||
| * | | Dont cache the conn_spec_name when empty | Arthur Neves | 2016-05-11 | 2 | -2/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | We cannot cache the connection_specification_name when it doesnt exist. Thats because the parent value could change, and we should keep failling back to the parent. If we cache that in a children as an ivar, we would not fallback anymore in the next call, so the children would not get the new parent spec_name. | ||||
* | | | Set conn_spec_name after remove | Arthur Neves | 2016-05-11 | 1 | -2/+2 |
|/ / | | | | | | | | | | | `remove_connection` can reset the `connection_specification_name`, so we need to to set it after the remove_connection call on `establish_connection` method. | ||||
* | | [ci skip] Update documents of `ConnectionHandler` | Vipul A M | 2016-05-11 | 1 | -3/+1 |
|\ \ | | | | | | | [ci skip] Update documents of `ConnectionHandler` | ||||
| * | | [ci skip] Update documents of `ConnectionHandler` | yui-knk | 2016-05-11 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Follow up of #24844. The key of `@owner_to_pool` was changed from `klass.name` to `spec.name`. By this change "memory leaks in development mode" will not happen, bacause the equality of string is not changed by reloading of model files. | ||||
* | | | Merge pull request #24967 from fgo/patch-17 | प्रथमेश Sonpatki | 2016-05-11 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Getting Started Guide: Update Ruby version to 2.3.1p112 [ci skip] | ||||
| * | | Getting Started Guide: Update Ruby version to 2.3.1p112 | Francis Go | 2016-05-11 | 1 | -1/+1 |
|/ / | | | | | | | [ci skip] | ||||
* | | Make sure we reset the connection_specification_name on | Arthur Neves | 2016-05-10 | 2 | -1/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove_connection When calling `remove_connection` on a model, we delete the pool so we also need to reset the `connection_specification_name` so it will fallback to the parent. This was the current behavior before rails 5, which will fallback to the parent connection pool. [fixes #24959] Special thanks to @jrafanie for working with me on this fix. | ||||
* | | Merge pull request #24956 from zachattack/patch-1 | Jon Moss | 2016-05-10 | 1 | -1/+1 |
|\ \ | | | | | | | Minor syntax change | ||||
| * | | Minor syntax change | Zach | 2016-05-10 | 1 | -1/+1 |
|/ / | | | | | While working on this very example recently, I found that Rails will throw POST errors if you leave an empty block in front the `format.js` when using either `remote: true` or vanilla JS/JQuery. | ||||
* | | Merge pull request #24950 from kamipo/should_quote_lock_name | Rafael França | 2016-05-10 | 2 | -5/+5 |
|\ \ | | | | | | | Should quote `lock_name` to pass to `get_advisory_lock` | ||||
| * | | Should quote `lock_name` to pass to `get_advisory_lock` | Ryuta Kamizono | 2016-05-10 | 2 | -5/+5 |
| | | | |||||
* | | | Merge pull request #24939 from Neodelf/again_with_loop | Xavier Noria | 2016-05-10 | 1 | -2/+1 |
|\ \ \ | |/ / |/| | | Replacement cycle for readability | ||||
| * | | Replacement cycle for readability | Molchanov Andrey | 2016-05-10 | 1 | -2/+1 |
| | | | |||||
* | | | Use sass-rails and coffee-rails that work with Rails 5.1 | Rafael Mendonça França | 2016-05-10 | 1 | -2/+2 |
| | | | |||||
* | | | Update Ruby report templates | Rafael Mendonça França | 2016-05-10 | 3 | -3/+3 |
| | | | |||||
* | | | Bump the deprecation horizon | Rafael Mendonça França | 2016-05-10 | 2 | -2/+2 |
| | | | |||||
* | | | Add migration compatibility class for Rails 5.1 | Rafael Mendonça França | 2016-05-10 | 1 | -1/+4 |
| | | | |||||
* | | | Start Rails 5.1 development :tada: | Rafael Mendonça França | 2016-05-10 | 24 | -5268/+101 |
| | | | |||||
* | | | Merge pull request #24948 from prathamesh-sonpatki/fix-gemfile-lock | Kasper Timm Hansen | 2016-05-10 | 1 | -8/+5 |
|\ \ \ | | | | | | | | | Fix Gemfile.lock by updating rails-dom-testing | ||||
| * | | | Fix Gemfile.lock by updating rails-dom-testing | Prathamesh Sonpatki | 2016-05-10 | 1 | -8/+5 |
|/ / / | | | | | | | | | | - Followup of https://github.com/rails/rails/pull/24946. | ||||
* | | | Merge pull request #24946 from connorshea/patch-1 | Rafael França | 2016-05-10 | 3 | -3/+3 |
|\ \ \ | | | | | | | | | Update rails-dom-testing gem to 2.0 | ||||
| * | | | Update rails-dom-testing gem to 2.0 | Connor Shea | 2016-05-09 | 3 | -3/+3 |
|/ / / | | | | | | | | | | Resolves #24924. | ||||
* | | | Merge pull request #24936 from jkowens/path_check | Santiago Pastorino | 2016-05-09 | 1 | -6/+2 |
|\ \ \ | | | | | | | | | use Rack::Utils.valid_path? to check path | ||||
| * | | | use Rack::Utils.valid_path? to check path | Jordan Owens | 2016-05-09 | 1 | -6/+2 |
| | | | | | | | | | | | | | | | | This commit uses the new method in Rack to check if a path is valid. | ||||
* | | | | Merge pull request #24929 from rosenfeld/patch-6 | Santiago Pastorino | 2016-05-09 | 1 | -1/+18 |
|\ \ \ \ | | | | | | | | | | | Improve AV changelog with regards to default RAW handler | ||||
| * | | | | Improve AV changelog with regards to default RAW handler | Rodrigo Rosenfeld Rosas | 2016-05-09 | 1 | -1/+18 |
| |/ / / | | | | | | | | | | | | | It highlights which kind of incompatibilities this could lead to when rendering plain JS or HTML partials. | ||||
* | | | | Merge pull request #24942 from bvsatyaram/feature-getting-started-guide | Vipul A M | 2016-05-10 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Feature getting started guide [ci skip] | ||||
| * | | | | Grammar corrections to Getting Started Guide [ci skip] | BV Satyaram | 2016-05-10 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Merge pull request #24937 from pedroadame/master | Vipul A M | 2016-05-10 | 1 | -0/+1 |
|\ \ \ \ | |_|/ / |/| | | | Add :ssl/:tls to ActionMailer rdoc [ci skip] | ||||
| * | | | Add :ssl/:tls to ActionMailer [ci skip] | Pedro Adame Vergara | 2016-05-09 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #24935 from javan/actioncable-javascript-tests | Jeremy Daer | 2016-05-09 | 9 | -0/+4631 |
|\ \ \ \ | |/ / / |/| | | | WIP: Action Cable JavaScript tests | ||||
| * | | | Kick off initial JavaScript tests | Javan Makhmali | 2016-05-09 | 9 | -0/+4631 |
| |/ / | |||||
* | | | Extract resolver cache disabling to a method. | Kasper Timm Hansen | 2016-05-09 | 1 | -22/+23 |
| | | | | | | | | | | | | Will be using this in later code. | ||||
* | | | No need to call `remove_template`. | Kasper Timm Hansen | 2016-05-09 | 1 | -1/+0 |
|/ / | | | | | | | | | Each test executes in another tmp folder, so there's no chance of polluting another test run. | ||||
* | | Merge pull request #24925 from Neodelf/again_with_loop | Xavier Noria | 2016-05-08 | 1 | -2/+2 |
|\ \ | | | | | | | Replacement cycle for readability | ||||
| * | | Replacement cycle for readability | Molchanov Andrey | 2016-05-09 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #24911 from meinac/change_http_to_https | Vipul A M | 2016-05-09 | 1 | -4/+4 |
|\ \ | | | | | | | Change http github links to https [ci skip] | ||||
| * | | Change http github links to https [ci skip] | Mehmet Emin İNAÇ | 2016-05-08 | 1 | -4/+4 |
| | | | | | | | | | | | | Follow up to 7d55c846f11a435a4c7aae58f99279a2b9dd8506 | ||||
* | | | Merge pull request #24915 from Erol/use-consistent-term-underscored | प्रथमेश Sonpatki | 2016-05-08 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Use consistent term `underscored` |