aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* don't build the reflection chain to calculate `nested?`Aaron Patterson2016-03-041-1/+9
| | | | | | | | We know a reflection can be considered as `nested?` if the source reflection or the through reflection are also through reflections (since the through reflection will also add another join table). This allows us to avoid traversing the entire reflection tree just to calculate whether or not there will be more join tables.
* remove useless ivarAaron Patterson2016-03-041-1/+0
|
* Merge pull request #24053 from mohitnatoo/rails-dev-cacheKasper Timm Hansen2016-03-041-1/+1
|\ | | | | using rails dev:cache instead of rake dev:cache in test case
| * - using rails dev:cache instead of rake dev:cache in test caseMohit Natoo2016-03-041-1/+1
| |
* | Merge pull request #24050 from mohitnatoo/rails-routes-railtiesKasper Timm Hansen2016-03-041-7/+7
|\ \ | | | | | | [ci skip] correcting test case specifying `rails routes` instead of `rake routes`
| * | making a test definition more clear.Mohit Natoo2016-03-041-1/+1
| | |
| * | [ci skip] using correcting test case names specifying `rails routes` instead ↵Mohit Natoo2016-03-041-6/+6
| |/ | | | | | | of `rake routes`
* | Merge pull request #24057 from javan/actioncable-return-subscriptionJeremy Daer2016-03-041-3/+4
|\ \ | | | | | | Action Cable: Return subscription object(s) when updating the collection
| * | Return subscription object(s) when updating the collectionJavan Makhmali2016-03-041-3/+4
|/ /
* | Merge pull request #24056 from lifo/cable-create-subscriptions-fixJeremy Daer2016-03-041-0/+2
|\ \ | | | | | | Fix ActionCable.Subscriptions#create
| * | Make sure ActionCable.Subscriptions#create always returns the newly created ↵Pratik Naik2016-03-041-0/+2
|/ / | | | | | | subscription object
* | Merge pull request #24052 from ↵Akira Matsuda2016-03-043-1/+7
|\ \ | | | | | | | | | | | | bquorning/partial-rendering-with-collection-and-dot-in-partial-name Fix partial rendering with dot in filename
| * | Fix partial rendering with dot in filenameBenjamin Quorning2016-03-043-1/+7
|/ / | | | | | | | | | | | | | | When rendering a collection with a partial whose filename contains a dot, e.g. "customer.mobile", we would set a `locals[:'customer.mobile']` variable instead of, as in earlier versions of Rails, `locals[:customer]`. This bug was introduced in da9038eaa5d19c77c734a044c6b35d7bfac01104.
* | Merge pull request #24049 from mohitnatoo/railties-run-manuallyप्रथमेश Sonpatki2016-03-041-2/+1
|\ \ | |/ |/| Correcting sentence in description of application.rb in ralities
| * [ci skip] correcting sentence in description of application.rbMohit Natoo2016-03-041-2/+1
|/ | | | Adding period in the end.
* Merge pull request #24045 from Sarah-Alsinan/patch-4Kasper Timm Hansen2016-03-041-1/+1
|\ | | | | Update base.rb [ci skip]
| * Update base.rbSarah A2016-03-031-1/+1
|/
* Merge pull request #24042 from Sarah-Alsinan/patch-3Arun Agrawal2016-03-041-1/+1
|\ | | | | Update Gemfile
| * Update GemfileSarah A2016-03-031-1/+1
|/ | | Changes "as has to be loaded" to "as it has to be loaded"
* Merge pull request #24039 from javan/actioncable-cleanupJeremy Daer2016-03-036-22/+24
|\ | | | | Action Cable: client side 💅
| * Store reference to Subscriptions instance for convenienceJavan Makhmali2016-03-031-5/+6
| |
| * Implicity add Subscription instance to subscriptions collectionJavan Makhmali2016-03-032-13/+12
| |
| * Share default mount path with client side .jsJavan Makhmali2016-03-033-3/+4
| |
| * Fix location of default mount path valueJavan Makhmali2016-03-031-2/+3
|/ | | | #getConfig was implmented as general utility for reading action-cable-* meta tags (hence the `name` argument). Introduced in 8b69f1eeba753c38364fb88136b2503480f2de1d.
* Merge pull request #24038 from javan/actioncable-lazy-connection-monitorJeremy Daer2016-03-033-41/+52
|\ | | | | Action Cable: Defer starting connection monitor until a connection is opened
| * Defer starting connection monitor until a connection is openedJavan Makhmali2016-03-033-41/+52
|/
* Merge pull request #24021 from y-yagi/add_scaffold_stylesheet_to_guideJon Moss2016-03-031-0/+1
|\ | | | | add `scaffold_stylesheet` method to guide [ci skip]
| * add `scaffold_stylesheet` method to guide [ci skip]yuuji.yaginuma2016-03-041-0/+1
| | | | | | | | `scaffold_stylesheet` was added in #20479.
* | Merge pull request #24036 from javan/actioncable-lazy-connectJeremy Daer2016-03-033-9/+10
|\ \ | | | | | | Action Cable: Establish WebSocket connection when first subscription is created
| * | Establish WebSocket connection when first subscription is created. Fixes #24026Javan Makhmali2016-03-033-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 Hansen2016-03-031-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 Hansen2016-03-032-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 Hansen2016-03-031-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-optionMatthew Draper2016-03-0431-52/+229
|\ \ | | | | | | Support faye-websocket + EventMachine as an option
| * | Support faye-websocket + EventMachine as an optionMatthew Draper2016-03-0231-52/+229
| | |
* | | don't treat all associations with extensions as instance dependent.Yves Senn2016-03-034-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-anXavier Noria2016-03-037-12/+12
|\ \ \ | | | | | | | | Change 'a HTTP' to 'an HTTP' [ci skip]
| * | | Change 'a HTTP' to 'an HTTP' [ci skip]Santosh Wadghule2016-03-037-12/+12
| | | |
* | | | Merge pull request #24024 from ↵Rafael França2016-03-031-2/+8
|\ \ \ \ | |/ / / |/| | | | | | | | | | | jonatack/niceify-dynamic-routes-deprecation-messages Niceify the dynamic routes deprecation messages
| * | | Niceify the dynamic routes deprecation messagesJon Atack2016-03-031-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-anJon Moss2016-03-031-1/+1
|\ \ \ | | | | | | | | Change 'a HTML' to 'an HTML' [ci skip]
| * | | Change 'a HTML' to 'an HTML' [ci skip]Santosh Wadghule2016-03-031-1/+1
| |/ /
* | | Merge pull request #24023 from danielrhodes/bug/ac-connection-monitor-disconnectMatthew Draper2016-03-042-0/+2
|\ \ \ | | | | | | | | ConnectionMonitor is once again notified of disconnect
| * | | ConnectionMonitor is once again notified of disconnectDaniel Rhodes2016-03-032-0/+2
| |/ /
* / / Prevent nested ExecutionWrapper calls even when using run! directlyMatthew Draper2016-03-042-9/+16
|/ /
* | Merge pull request #24015 from meinac/active_record_migrations_doc_changesRafael França2016-03-021-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-031-1/+1
|/ / | | | | | | [ci skip]
* | Merge pull request #24011 from gsamokovarov/ar-persistence-api-docs-fixRafael França2016-03-021-1/+1
|\ \ | | | | | | Fix a small template misrender in ActiveRecord::Persistence
| * | Fix a small template misrender in ActiveRecord::PersistenceGenadi Samokovarov2016-03-021-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_sqlRafael França2016-03-025-60/+17
|\ \ | | | | | | Deprecate `{insert|update|delete}_sql` in `DatabaseStatements`
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 13:15:38 +0000