aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #23840 from yui-knk/improve_the_readability_of_ar_docJon Moss2016-02-231-6/+14
|\ | | | | [ci skip] Improve the readability of documents of nested_attributes
| * [ci skip] Improve the readability of documents of nested_attributesyui-knk2016-02-241-6/+14
| |
* | Merge pull request #23837 from mgroeneman/fix-form-helper-guide-typoJon Moss2016-02-231-1/+1
|\ \ | | | | | | Fix typo in Form Helpers Guide
| * | [ci skip] No hyphen in 'side effects'Michael Groeneman2016-02-231-1/+1
| | |
| * | [ci skip] Fix typo in Form Helpers GuideMichael Groeneman2016-02-231-1/+1
| | |
* | | Merge pull request #23632 from maclover7/fix-23620Matthew Draper2016-02-242-0/+13
|\ \ \ | |/ / |/| | Fix `request.ssl?` bug with Action Cable
| * | Fix `request.ssl?` bug with Action CableJon Moss2016-02-232-0/+13
| | | | | | | | | | | | | | | This bug affects `wss://` requests when running Action Cable in-app. Fixes #23620.
* | | Revert changes to validations from PR #18612eileencodes2016-02-239-89/+21
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to fix issue #17621 we added a check to validations that determined if a record should be validated. Based on the existing tests and behavior we wanted we determined the best way to do that was by checking if `!record.peristed? || record.changed? || record.marked_for_destruction?` This change didn't make it into a release until now. When #23790 was opened we realized that `valid?` and `invalid?` were broken and did not work on persisted records because of the `!record.persisted?`. While there is still a bug that #17621 brought up, this change was too drastic and should not be a RC blocker. I will work on fixing this so that we don't break `valid?` but also aren't validating parent records through child records if that parent record is validate false. This change removes the code changes to validate and the corresponding tests. It adds tests for two of the bugs found since Rails 5 beta2 release. Fixes #17621
* | Merge pull request #23734 from schneems/schneems/stdout-againRichard Schneeman2016-02-232-0/+15
|\ \ | | | | | | Alternative to #23638 log to STDOUT via env var
| * | Alternative to #23638 log to STDOUT via env varschneems2016-02-172-0/+15
| | | | | | | | | | | | | | | | | | People who deploy to containers or other places where they might have some sort of a log wrapping service use stdout. With this change new rails apps can be configured to output to STDOUT via setting `RAILS_LOG_TO_STDOUT` to any value. This allows container images or services to set the value for all apps without having to modify configuration for each application. If an app wants to opt out, they can either delete from the env hash, or remove that configuration. cc/ @rafaelfranca
* | | clear digest cache between testsAaron Patterson2016-02-231-0/+1
| | | | | | | | | | | | | | | otherwise we don't get the log messages we're looking for and the tests fail intermittently.
* | | Merge pull request #23628 from maclover7/fix-23625Sean Griffin2016-02-234-1/+38
|\ \ \ | | | | | | | | Fix issue #23625
| * | | Fix issue #23625Jon Moss2016-02-184-1/+38
| |/ / | | | | | | | | | | | | | | | This resolves a bug where if the primary key used is not `id` (ex: `uuid`), and has a `validates_uniqueness_of` in the model, a uniqueness error would be raised. This is a partial revert of commit `119b9181ece399c67213543fb5227b82688b536f`, which introduced this behavior.
* | | Merge pull request #23789 from ↵Rafael França2016-02-2327-55/+68
|\ \ \ | | | | | | | | | | | | | | | | wisetara/wisetara/deprecate-args-ActiveSupport__TestCase#assert_nothing_raised-for-pr Wisetara/deprecate args active support test case#assert nothing raised for pr
| * | | add deprecation warning to assert_nothing_raised and changelog entryTara Scherner de la Fuente2016-02-222-2/+15
| | | |
| * | | update assert_nothing_raised in testing.mdTara Scherner de la Fuente2016-02-221-1/+1
| | | |
| * | | remove args from assert_nothing_raised in testsTara Scherner de la Fuente2016-02-2225-54/+54
| | |/ | |/|
* | | reestablish previous connection after creating all databasesAaron Patterson2016-02-232-0/+17
| | | | | | | | | | | | | | | | | | creating all databases mutates the connection pool. This patch restores the connection pool to the connection spec established before creating all databases. Fixes #23279
* | | Merge pull request #23813 from lifo/faye-websocketDavid Heinemeier Hansson2016-02-235-7/+51
|\ \ \ | | | | | | | | Improve Action Cable reconnection reliability
| * | | Fix isAlive condition and add more loggingJavan Makhmali2016-02-231-5/+7
| | | |
| * | | ActionCable.logJavan Makhmali2016-02-233-14/+25
| | | |
| * | | Uninstall event handlers when replacing WebSocket instanceJavan Makhmali2016-02-231-0/+6
| | | | | | | | | | | | | | | | Ensures we don't get "onclose" events from a previous WebSocket that was in the "closing" state
| * | | Connection#isAliveJavan Makhmali2016-02-231-3/+3
| | | |
| * | | Log ConnectionMonitor connectPratik Naik2016-02-231-0/+1
| | | |
| * | | Confirm connection monitor subscription on openPratik Naik2016-02-232-2/+9
| | | |
| * | | Treat 'closing' state as closed.Pratik Naik2016-02-231-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | We are seeing cases where the websockets get stuck in the 'closing' state after a tab has been in background for a while. So lets treat those websockets as closed.
| * | | Add client-side console logging to help debug reconnect issuesJavan Makhmali2016-02-232-1/+15
| | | |
* | | | Make sure we don't change the global state in the testsRafael Mendonça França2016-02-231-0/+4
| | | | | | | | | | | | | | | | We are creating the table but not deleting after the test.
* | | | Merge pull request #23825 from kamipo/remove_needless_drop_table_test_limitsRafael França2016-02-231-3/+0
|\ \ \ \ | |_|/ / |/| | | Remove needless `drop_table :test_limits`
| * | | Remove needless `drop_table :test_limits`Ryuta Kamizono2016-02-231-3/+0
|/ / / | | | | | | | | | A `:test_limits` table has not been created.
* | | Merge pull request #23821 from dgynn/actionmailer_lazy_loadingRafael França2016-02-231-10/+12
|\ \ \ | | | | | | | | Prevent ActionMailer initializer from triggering load of ActionMailer
| * | | Prevent ActionMailer initializer from triggering load of ActionMailerDave Gynn2016-02-221-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the after_initialize block has been changed to use the configuration from `config.action_mailer` rather than `ActionMailer::Base` so that action mailer is not loaded before it is necessary. the mailer preview routes setup have been moved out of an `on_load(:action_mailer)` block.
* | | | Merge pull request #23419 from ↵Matthew Draper2016-02-232-2/+14
|\ \ \ \ | |/ / / |/| | | | | | | | | | | prathamesh-sonpatki/fix-showing-of-deprecation-warning-for-legacy-migrations Correctly show deprecation warning for incompatible migrations
| * | | Fix random failures of tests on TravisPrathamesh Sonpatki2016-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Tests on Travis are randomly failing because schema_migrations table does not exist in teardown block. - Also checked that all other places where we have used `ActiveRecord::SchemaMigration.delete_all` we have rescued it, so used it here also. This failure was not specifically related to the test added in this PR but to overall compatibility migration tests, so adding as separate commit.
| * | | Correctly show deprecation warning for incompatible migrationsPrathamesh Sonpatki2016-02-122-1/+13
| | | |
* | | | Merge pull request #23819 from meinac/actioncable_doc_fixRafael França2016-02-221-4/+4
|\ \ \ \ | | | | | | | | | | Action Cable readme fix [ci skip]
| * | | | Action Cable readme fix [ci skip]Mehmet Emin İNAÇ2016-02-231-4/+4
| | | | |
* | | | | Merge pull request #23669 from maclover7/internal-routesRafael França2016-02-226-10/+36
|\ \ \ \ \ | |/ / / / |/| | | | Add `internal` attribute to routes
| * | | | Add `internal` attribute to routesJon Moss2016-02-226-10/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is meant to provide a way for Action Cable, Sprockets, and possibly other Rack applications to mark themselves as internal, and to exclude themselves from the routing inspector, and thus `rails routes` / `rake routes`. I think this is the only way to have mounted Rack apps be marked as internal, within AD/Journey. Another option would be to create an array of regexes for internal apps, and then to iterate over that everytime a request comes through. Also, I only had the first `add_route` method set `internal`'s default to false, to avoid littering it all over the codebase.
* | | | | Merge pull request #23668 from maclover7/cable-docsRafael França2016-02-2216-70/+67
|\ \ \ \ \ | | | | | | | | | | | | Full Action Cable documentation read through
| * | | | | Full Action Cable documentation read throughJon Moss2016-02-1716-70/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR checks all active Action Cable documentation for typos and other fixes. It aims to make sure that when Rails 5 is released, that the Action Cable docs are up to snuff with the other documentation included with Rails. [ci skip]
* | | | | | Merge pull request #23600 from maclover7/actioncable-workRafael França2016-02-228-0/+64
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Assorted Railties generators work
| * | | | | Add notes for future selvesJon Moss2016-02-222-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once RubyGems 2.5.0 is required, then the duplicated files can be removed, and symlinks can be used instead. [ci skip]
| * | | | | Generate ApplicationCable files if they do not already existJon Moss2016-02-224-0/+38
| | | | | |
| * | | | | Generate ApplicationRecord if it does not already existJon Moss2016-02-223-0/+19
| | | | | |
| * | | | | Generate `config/cable.yml` in `rails:update` commandJon Moss2016-02-221-0/+5
|/ / / / /
* | | | | Merge pull request #23816 from rails/params_parser_apiRafael França2016-02-225-9/+47
|\ \ \ \ \ | | | | | | | | | | | | Make sure the parameter parsers register API work with overidden mime types.
| * | | | | Make sure we unregister the mime type before registeringRafael Mendonça França2016-02-221-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | Also make sure we don't change the global state of our test suite.
| * | | | | Transform the mime object to symbol when registering the parsersRafael Mendonça França2016-02-223-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will keep our current API working without having the users to change their codebases.
| * | | | | Use symbol of mime type instead of object to get correct parserMehmet Emin İNAÇ2016-02-224-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After registering new `:json` mime type `parsers.fetch` can't find the mime type because new mime type is not equal to old one. Using symbol of the mime type as key on parsers hash solves the problem. Closes #23766