aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | Publish Action Cable to NPM when we release.Jon Moss2016-05-114-8/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
* | | | | | | | | | | | | | Merge pull request #24980 from merhard/virtual-attribute-defaultSean Griffin2016-05-112-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define ActiveRecord::Attribute::Null#type_cast
| * | | | | | | | | | | | | | Define ActiveRecord::Attribute::Null#type_castMatthew Erhard2016-05-112-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using ActiveRecord::Base.attribute to declare an attribute with a default value on a model where the attribute is not backed by the database would raise a NotImplementedError when model.save is called. The error originates from https://github.com/rails/rails/blob/59d252196b36f6afaafd231756d69ea21537cf5d/activerecord/lib/active_record/attribute.rb#L84. This is called from https://github.com/rails/rails/blob/59d252196b36f6afaafd231756d69ea21537cf5d/activerecord/lib/active_record/attribute.rb#L46 on an ActiveRecord::Attribute::Null object. This commit corrects the behavior by implementing ActiveRecord::Attribute::Null#type_cast. With ActiveRecord::Attribute::Null#type_cast defined, ActiveRecord::Attribute::Null#value (https://github.com/rails/rails/blob/59d252196b36f6afaafd231756d69ea21537cf5d/activerecord/lib/active_record/attribute.rb#L173..L175) can be replaced with its super method (https://github.com/rails/rails/blob/59d252196b36f6afaafd231756d69ea21537cf5d/activerecord/lib/active_record/attribute.rb#L36..L40). fixes #24979
* | | | | | | | | | | | | | | Merge pull request #24982 from tomkadwill/improve_clarity_of_raw_host_with_portKasper Timm Hansen2016-05-112-3/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | Improve documentation and tests for raw_host_with_port and host_with_…
| * | | | | | | | | | | | | | Improve documentation and tests for raw_host_with_port and host_with_portTom Kadwill2016-05-112-3/+30
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | remove_connection should not remove parent connectionArthur Neves2016-05-112-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-19Arthur Nogueira Neves2016-05-111-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 Go2016-05-121-0/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #24974 from mohitnatoo/arrayinquirer-any-definitionVipul A M2016-05-111-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added clarity to documentation of ArrayInquirer#any? [ci skip]
| * | | | | | | | | | | | | | - Added clarity to documentation of ArrayInquirer#any? [ci skip]Mohit Natoo2016-05-111-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प्रथमेश Sonpatki2016-05-111-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 Go2016-05-121-1/+1
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #24912 from prathamesh-sonpatki/api-fix-response-formatSantiago Pastorino2016-05-112-40/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | API only apps: Preserve request format for HTML requests too
| * | | | | | | | | | | | | | API only apps: Preserve request format for HTML requests tooPrathamesh Sonpatki2016-05-112-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_nameArthur Nogueira Neves2016-05-112-2/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dont cache the conn_spec_name when empty
| * | | | | | | | | | | | | | | Dont cache the conn_spec_name when emptyArthur Neves2016-05-112-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 removeArthur Neves2016-05-111-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 M2016-05-111-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Update documents of `ConnectionHandler`
| * | | | | | | | | | | | | | | [ci skip] Update documents of `ConnectionHandler`yui-knk2016-05-111-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प्रथमेश Sonpatki2016-05-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | Getting Started Guide: Update Ruby version to 2.3.1p112 [ci skip]
| * | | | | | | | | | | | | | | Getting Started Guide: Update Ruby version to 2.3.1p112Francis Go2016-05-111-1/+1
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | / / / / / / Make sure we reset the connection_specification_name onArthur Neves2016-05-102-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-1Jon Moss2016-05-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor syntax change
| * | | | | | | | | | | | | | Minor syntax changeZach2016-05-101-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_nameRafael França2016-05-102-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should quote `lock_name` to pass to `get_advisory_lock`
| * | | | | | | | | | | | | | Should quote `lock_name` to pass to `get_advisory_lock`Ryuta Kamizono2016-05-102-5/+5
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #24939 from Neodelf/again_with_loopXavier Noria2016-05-101-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | Replacement cycle for readability
| * | | | | | | | | | | | | | Replacement cycle for readabilityMolchanov Andrey2016-05-101-2/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Use sass-rails and coffee-rails that work with Rails 5.1Rafael Mendonça França2016-05-101-2/+2
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Update Ruby report templatesRafael Mendonça França2016-05-103-3/+3
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Bump the deprecation horizonRafael Mendonça França2016-05-102-2/+2
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Add migration compatibility class for Rails 5.1Rafael Mendonça França2016-05-101-1/+4
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Start Rails 5.1 development :tada:Rafael Mendonça França2016-05-1024-5268/+101
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #24948 from prathamesh-sonpatki/fix-gemfile-lockKasper Timm Hansen2016-05-101-8/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Gemfile.lock by updating rails-dom-testing
| * | | | | | | | | | | | | | | Fix Gemfile.lock by updating rails-dom-testingPrathamesh Sonpatki2016-05-101-8/+5
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Followup of https://github.com/rails/rails/pull/24946.
* | | | | | | | | | | | | | | Merge pull request #24946 from connorshea/patch-1Rafael França2016-05-103-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update rails-dom-testing gem to 2.0
| * | | | | | | | | | | | | | | Update rails-dom-testing gem to 2.0Connor Shea2016-05-093-3/+3
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolves #24924.
* | | | | | | | | | | | | | | Merge pull request #24936 from jkowens/path_checkSantiago Pastorino2016-05-091-6/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use Rack::Utils.valid_path? to check path
| * | | | | | | | | | | | | | | use Rack::Utils.valid_path? to check pathJordan Owens2016-05-091-6/+2
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit uses the new method in Rack to check if a path is valid.
* | | | | | | | | | | | | | | Merge pull request #24929 from rosenfeld/patch-6Santiago Pastorino2016-05-091-1/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve AV changelog with regards to default RAW handler
| * | | | | | | | | | | | | | | Improve AV changelog with regards to default RAW handlerRodrigo Rosenfeld Rosas2016-05-091-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-guideVipul A M2016-05-101-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feature getting started guide [ci skip]
| * | | | | | | | | | | | | | | Grammar corrections to Getting Started Guide [ci skip]BV Satyaram2016-05-101-2/+2
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #24937 from pedroadame/masterVipul A M2016-05-101-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | Add :ssl/:tls to ActionMailer rdoc [ci skip]
| * | | | | | | | | | | | | | Add :ssl/:tls to ActionMailer [ci skip]Pedro Adame Vergara2016-05-091-0/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #24935 from javan/actioncable-javascript-testsJeremy Daer2016-05-099-0/+4631
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | WIP: Action Cable JavaScript tests
| * | | | | | | | | | | | | | Kick off initial JavaScript testsJavan Makhmali2016-05-099-0/+4631
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Extract resolver cache disabling to a method.Kasper Timm Hansen2016-05-091-22/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Will be using this in later code.
* | | | | | | | | | | | | | No need to call `remove_template`.Kasper Timm Hansen2016-05-091-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_loopXavier Noria2016-05-081-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replacement cycle for readability