aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #23837 from mgroeneman/fix-form-helper-guide-typoJon Moss2016-02-231-1/+1
|\
| * [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 CableJon Moss2016-02-232-0/+13
* | Revert changes to validations from PR #18612eileencodes2016-02-239-89/+21
|/
* Merge pull request #23734 from schneems/schneems/stdout-againRichard Schneeman2016-02-232-0/+15
|\
| * Alternative to #23638 log to STDOUT via env varschneems2016-02-172-0/+15
* | clear digest cache between testsAaron Patterson2016-02-231-0/+1
* | Merge pull request #23628 from maclover7/fix-23625Sean Griffin2016-02-234-1/+38
|\ \
| * | Fix issue #23625Jon Moss2016-02-184-1/+38
| |/
* | Merge pull request #23789 from wisetara/wisetara/deprecate-args-ActiveSupport...Rafael França2016-02-2327-55/+68
|\ \
| * | 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
* | | Merge pull request #23813 from lifo/faye-websocketDavid Heinemeier Hansson2016-02-235-7/+51
|\ \ \
| * | | 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
| * | | 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
| * | | 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
* | | | Merge pull request #23825 from kamipo/remove_needless_drop_table_test_limitsRafael França2016-02-231-3/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove needless `drop_table :test_limits`Ryuta Kamizono2016-02-231-3/+0
|/ / /
* | | Merge pull request #23821 from dgynn/actionmailer_lazy_loadingRafael França2016-02-231-10/+12
|\ \ \
| * | | Prevent ActionMailer initializer from triggering load of ActionMailerDave Gynn2016-02-221-10/+12
* | | | Merge pull request #23419 from prathamesh-sonpatki/fix-showing-of-deprecation...Matthew Draper2016-02-232-2/+14
|\ \ \ \ | |/ / / |/| | |
| * | | Fix random failures of tests on TravisPrathamesh Sonpatki2016-02-121-1/+1
| * | | 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]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 routesJon Moss2016-02-226-10/+36
* | | | | Merge pull request #23668 from maclover7/cable-docsRafael França2016-02-2216-70/+67
|\ \ \ \ \
| * | | | | Full Action Cable documentation read throughJon Moss2016-02-1716-70/+67
* | | | | | Merge pull request #23600 from maclover7/actioncable-workRafael França2016-02-228-0/+64
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add notes for future selvesJon Moss2016-02-222-0/+2
| * | | | | 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 we unregister the mime type before registeringRafael Mendonça França2016-02-221-10/+22
| * | | | | Transform the mime object to symbol when registering the parsersRafael Mendonça França2016-02-223-5/+15
| * | | | | Use symbol of mime type instead of object to get correct parserMehmet Emin İNAÇ2016-02-224-6/+22
* | | | | | make sure `rake test` respects TESTOPTSAaron Patterson2016-02-222-1/+15
|/ / / / /
* | | | | We are calling `to_s` in the method so we can call downcase nowRafael Mendonça França2016-02-221-3/+3