Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #24038 from javan/actioncable-lazy-connection-monitor | Jeremy Daer | 2016-03-03 | 3 | -41/+52 |
|\ | | | | | Action Cable: Defer starting connection monitor until a connection is opened | ||||
| * | Defer starting connection monitor until a connection is opened | Javan Makhmali | 2016-03-03 | 3 | -41/+52 |
|/ | |||||
* | Merge pull request #24021 from y-yagi/add_scaffold_stylesheet_to_guide | Jon Moss | 2016-03-03 | 1 | -0/+1 |
|\ | | | | | add `scaffold_stylesheet` method to guide [ci skip] | ||||
| * | add `scaffold_stylesheet` method to guide [ci skip] | yuuji.yaginuma | 2016-03-04 | 1 | -0/+1 |
| | | | | | | | | `scaffold_stylesheet` was added in #20479. | ||||
* | | Merge pull request #24036 from javan/actioncable-lazy-connect | Jeremy Daer | 2016-03-03 | 3 | -9/+10 |
|\ \ | | | | | | | Action Cable: Establish WebSocket connection when first subscription is created | ||||
| * | | Establish WebSocket connection when first subscription is created. Fixes #24026 | Javan Makhmali | 2016-03-03 | 3 | -9/+10 |
|/ / | | | | | | | | | * More intention revealing than connecting on the first call to Connection#send * Fixes that calls to Connection#send would attempt to open a connection when the WebSocket's state is CONNECTING | ||||
* | | [ci skip] Fix constrain_to documentation. | Kasper Timm Hansen | 2016-03-03 | 1 | -1/+1 |
| | | | | | | | | | | Forgot to update the documentation on the line just above the one I was changing in 4933132. Well done, Kasper :+1: | ||||
* | | Rename constrain_to to exclude. | Kasper Timm Hansen | 2016-03-03 | 2 | -7/+8 |
| | | | | | | | | | | | | | | | | | | `ActionDispatch::SSL` redirects all HTTP requests to HTTPS, not just some. The `constrain_to` option inverts this, so it sounds like the middleware only handles a few requests, rather than the majority with a few routes to opt out of the redirect. Renaming to `exclude` matches this intent more closely. | ||||
* | | [ci skip] Make collection caching explicit in guides. | Kasper Timm Hansen | 2016-03-03 | 1 | -15/+6 |
| | | | | | | | | | | | | Since f6e4814 was written we've made collection caching explicit. Thus the documentation is outdated and needs a rewrite. | ||||
* | | Merge pull request #23992 from matthewd/em-option | Matthew Draper | 2016-03-04 | 31 | -52/+229 |
|\ \ | | | | | | | Support faye-websocket + EventMachine as an option | ||||
| * | | Support faye-websocket + EventMachine as an option | Matthew Draper | 2016-03-02 | 31 | -52/+229 |
| | | | |||||
* | | | don't treat all associations with extensions as instance dependent. | Yves Senn | 2016-03-03 | 4 | -1/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #23934. This is a forward port of ac832a43b4d026dbad28fed196d2de69ec9928ac Previously the scope of all associations with extensions were wrapped in an instance dependent proc. This made it impossible to preload such associations. | ||||
* | | | Merge pull request #24027 from mechanicles/a-to-an | Xavier Noria | 2016-03-03 | 7 | -12/+12 |
|\ \ \ | | | | | | | | | Change 'a HTTP' to 'an HTTP' [ci skip] | ||||
| * | | | Change 'a HTTP' to 'an HTTP' [ci skip] | Santosh Wadghule | 2016-03-03 | 7 | -12/+12 |
| | | | | |||||
* | | | | Merge pull request #24024 from ↵ | Rafael França | 2016-03-03 | 1 | -2/+8 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | jonatack/niceify-dynamic-routes-deprecation-messages Niceify the dynamic routes deprecation messages | ||||
| * | | | Niceify the dynamic routes deprecation messages | Jon Atack | 2016-03-03 | 1 | -2/+8 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Follow-up to #23980. - Fix grammar: "be remove" -> "be removed". - Wrap lines at 80 chars. Lurvely ;-) | ||||
* | | | Merge pull request #24025 from mechanicles/a-to-an | Jon Moss | 2016-03-03 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Change 'a HTML' to 'an HTML' [ci skip] | ||||
| * | | | Change 'a HTML' to 'an HTML' [ci skip] | Santosh Wadghule | 2016-03-03 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #24023 from danielrhodes/bug/ac-connection-monitor-disconnect | Matthew Draper | 2016-03-04 | 2 | -0/+2 |
|\ \ \ | | | | | | | | | ConnectionMonitor is once again notified of disconnect | ||||
| * | | | ConnectionMonitor is once again notified of disconnect | Daniel Rhodes | 2016-03-03 | 2 | -0/+2 |
| |/ / | |||||
* / / | Prevent nested ExecutionWrapper calls even when using run! directly | Matthew Draper | 2016-03-04 | 2 | -9/+16 |
|/ / | |||||
* | | Merge pull request #24015 from meinac/active_record_migrations_doc_changes | Rafael França | 2016-03-02 | 1 | -1/+1 |
|\ \ | | | | | | | Changed behaviour of timestamps helper by create_table migration generator [ci skip] | ||||
| * | | Changed behaviour of timestamps helper by create_table migration generator ↵ | Mehmet Emin İNAÇ | 2016-03-03 | 1 | -1/+1 |
|/ / | | | | | | | [ci skip] | ||||
* | | Merge pull request #24011 from gsamokovarov/ar-persistence-api-docs-fix | Rafael França | 2016-03-02 | 1 | -1/+1 |
|\ \ | | | | | | | Fix a small template misrender in ActiveRecord::Persistence | ||||
| * | | Fix a small template misrender in ActiveRecord::Persistence | Genadi Samokovarov | 2016-03-02 | 1 | -1/+1 |
|/ / | | | | | | | | | | | | | | | See the end of [this] page. [ci skip] [this]: http://edgeapi.rubyonrails.org/classes/ActiveRecord/Persistence/ClassMethods.html#method-i-create | ||||
* | | Merge pull request #23086 from kamipo/deprecate_insert_update_delete_sql | Rafael França | 2016-03-02 | 5 | -60/+17 |
|\ \ | | | | | | | Deprecate `{insert|update|delete}_sql` in `DatabaseStatements` | ||||
| * | | Deprecate `{insert|update|delete}_sql` in `DatabaseStatements` | Ryuta Kamizono | 2016-03-02 | 5 | -60/+17 |
| | | | | | | | | | | | | | | | Originally, `{insert|update|delete}_sql` is protected methods. We can use the `{insert|update|delete}` public methods instead. | ||||
* | | | Do not run app.executor callbacks in integration tests | Jorge Bejar and Santiago Pastorino | 2016-03-02 | 1 | -11/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts changes made to integration tests in PR #23807. The issue happens when using capybara with a driver that needs to start a server in a separate thread like (poltergeist, selenium, etc). Both threads the capybara server one and the test thread end running syncronize over the interlock. | ||||
* | | | Fix CHANGELOG spacing [ci skip] | Jeremy Daer | 2016-03-02 | 4 | -20/+20 |
| | | | |||||
* | | | Add test to make sure the sprockets cache is not shared per environment | Rafael Mendonça França | 2016-03-02 | 2 | -2/+22 |
| | | | |||||
* | | | Merge pull request #24009 from yahonda/bundle_exec_activerecord_unittest | Rafael França | 2016-03-02 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | [ci skip] Add `bundle exec` for ActiveRecord unit tests | ||||
| * | | | [ci skip] Add `bundle exec` for ActiveRecord unit tests | Yasuo Honda | 2016-03-02 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge pull request #24001 from 5t111111/fix-gsub-cookies_serializer | Rafael França | 2016-03-02 | 2 | -2/+3 |
|\ \ \ \ | |/ / / |/| | | | Fix description in cookies_serializer.rb being corrupted by gsub when updating | ||||
| * | | | Fix description in cookies_serializer.rb being corrupted when updating | Hirofumi Wakasugi | 2016-03-02 | 2 | -2/+3 |
| | | | | |||||
* | | | | remove trailing whitespace. | Yves Senn | 2016-03-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #24002 from 5t111111/fix-typo-in-app_generator_test | Rafael França | 2016-03-02 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix typo in app_generator_test.rb | ||||
| * | | | | Fix typo in app_generator_test.rb | Hirofumi Wakasugi | 2016-03-02 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #23999 from maxehmookau/patch-1 | Rafael França | 2016-03-02 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix typo in implicit_render | ||||
| * | | | | Fix typo in implicit_render | Max Woolf | 2016-03-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | When trying to make a request and the request doesn't have a suitable template, the new error messages are really helpful but there's a small (and I mean, VERY small) typo that has been bugging me for the last few days. This adds the space and restores order to the universe. :heart: | ||||
* | | | | | Merge pull request #23679 from kamipo/remove_not_needed_exec_insert | Yves Senn | 2016-03-02 | 1 | -4/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove not needed `exec_insert` in mysql2 adapter | ||||
| * | | | | | Remove not needed `exec_insert` in mysql2 adapter | Ryuta Kamizono | 2016-03-02 | 1 | -4/+0 |
| | |_|/ / | |/| | | | | | | | | | | | | | Simply it is sufficient to use the method in the super class. | ||||
* | | | | | Merge pull request #24003 from abhishekjain16/rails_routes_fix | Rafael França | 2016-03-02 | 1 | -9/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | [ci skip] Use rails routes instead of rake routes in inspector test … | ||||
| * | | | | | [ci skip] Use rails routes instead of rake routes in inspector test description | Abhishek Jain | 2016-03-02 | 1 | -9/+9 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #23649 from maclover7/fix-22675 | David Heinemeier Hansson | 2016-03-02 | 4 | -8/+27 |
|\ \ \ \ \ | |/ / / / |/| | | | | Accept channel identifiers with no backslashes/escaping | ||||
| * | | | | Accept JSON with no backslashes/escaping | Jon Moss | 2016-03-02 | 4 | -8/+27 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22675 Allow channel identifiers and also data with no backslahes/escaping to be accepted by the subscription storer. | ||||
* | | | | Merge pull request #23976 from danielrhodes/enhancement/ac-ping-to-message-type | Matthew Draper | 2016-03-02 | 7 | -19/+24 |
|\ \ \ \ | |_|/ / |/| | | | | | | | ActionCable: Add a "welcome" and "ping" message type | ||||
| * | | | Make ping into a message type | Daniel Rhodes | 2016-03-01 | 6 | -15/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes ping into a message type, which makes the whole protocol a lot more consistent. Also fixes hacks on the client side to make this all work. | ||||
| * | | | Added welcome message type and fix test hacks | Daniel Rhodes | 2016-03-01 | 5 | -5/+14 |
| | | | | |||||
* | | | | Merge pull request #23998 from prathamesh-sonpatki/rm-load-paths | Kasper Timm Hansen | 2016-03-02 | 1 | -1/+4 |
|\ \ \ \ | |_|/ / |/| | | | Remove requiring load_paths from tools/test.rb | ||||
| * | | | Remove requiring load_paths from tools/test.rb | Prathamesh Sonpatki | 2016-03-02 | 1 | -1/+4 |
|/ / / | | | | | | | | | | | | | | | | | | | - Instead require and setup Bundler - `tools/test.rb` is used internally from all `bin/test` scripts inside component gems. - Followup of https://github.com/rails/rails/commit/2abcdfd978fdcd491576a237e8c6be04ddaf884d. |