aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* generate config/spring.rb in new applications [closes #18874]Xavier Noria2016-02-294-0/+14
|
* Respect through association scopes when used with polymorphicSean Griffin2016-02-292-1/+8
| | | | | | | | | | | When the `source_type` option is passed to a has_many through, the resulting `Reflection` will be an instance of `PolymorphicReflection` and not `ThroughReflection`, meaning that it will ignore the scopes that it needs to apply from the through reflections. This adds an additional delegation call to remedy this. I've been finding the reflection code completely impenetrable lately, it could use some major love. Fixes #22726
* Merge pull request #23927 from gaurish/jruby_ci_actionpackRafael França2016-02-291-0/+5
|\ | | | | Run CI for ActionPack on JRuby
| * Try running CI for ActionPack on JRubyGaurish Sharma2016-02-271-0/+5
| | | | | | | | These are green on local. Checking to see they pass on travis too!
* | Merge pull request #23948 from ctm/remove_pathological_regexpRafael França2016-02-291-1/+1
|\ \ | | | | | | Removes potentially quadratic Regexp from ActiveRecord::LogSubscriber…
| * | Removes potentially quadratic Regexp from ActiveRecord::LogSubscriber#sql_colorClifford T. Matthews2016-02-231-1/+1
| | |
* | | Merge pull request #18766 from yasyf/issue_17864Sean Griffin2016-02-294-8/+68
|\ \ \ | | | | | | | | | | | | | | | | Honour joining model order in `has_many :through` associations when eager loading
| * | | Honour the order of the joining model in a `has_many :through`Yasyf Mohamedali2015-03-025-9/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | association when eager loading. Previously, eager loading a `has_many :through` association with no defined order would return the records in the natural order of the database. Now, these records will be returned in the order that the joining record is returned, in case there is a defined order there.
* | | | Merge pull request #23963 from gsamokovarov/exception-wrapper-no-ac-requireKasper Timm Hansen2016-02-291-1/+0
|\ \ \ \ | | | | | | | | | | Drop Action Controller require in ActionDispatch::ExceptionWrapper
| * | | | Drop Action Controller require in ActionDispatch::ExceptionWrapperGenadi Samokovarov2016-02-291-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only reference the Action Controller error classes by name in ActionDispatch::ExceptionWrapper, so there is no need to explicitly require them. It drops a tiny coupling between Action Dispatch and Action Controller, so it makes me feel warm inside. We still have a lot of others AC requires in the AD code base, but here, we can save it. [ci skip]
* | | | | Merge pull request #23955 from bdewater/doc-13897Sean Griffin2016-02-291-3/+9
|\ \ \ \ \ | | | | | | | | | | | | Add documentation for #13897 [skip ci]
| * | | | | Add documentation for #13897 [skip ci]Bart de Water2016-02-291-3/+9
| | | | | |
* | | | | | Merge pull request #23957 from delftswa2016/fix-documentation-stylesheetArthur Nogueira Neves2016-02-291-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Fix value of CSS background-color property in Ruby on Rails guide
| * | | | | Fix value of CSS background-color property in Rails guideBas van IJzendoorn2016-02-291-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Change background-color value to transparent, which is the default value of background-color. [ci skip]
* | | | | Merge pull request #23962 from mohitnatoo/rails_command_test_semanticsRafael França2016-02-291-9/+9
|\ \ \ \ \ | | | | | | | | | | | | Having more readable test descriptions in railties actions_test.rb
| * | | | | - Made changes to have test cases in actions_test more readable.Mohit Natoo2016-02-291-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Changed description with tests related to rails_command.
| * | | | | - Made changes to have test cases in actions_test more readable.Mohit Natoo2016-02-291-5/+5
| |/ / / /
* | | | | Merge pull request #23956 from delftswa2016/fix-documentationप्रथमेश Sonpatki2016-02-291-5/+5
|\ \ \ \ \ | |/ / / / |/| | | | Fix typos in Rails guide about Action View Overview
| * | | | Fix typos in Action View Overview guideBas van IJzendoorn2016-02-291-5/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | This patch fixes some typos in the Action View Overview section of the Rails guide. [ci skip]
* | | | Merge pull request #23951 from teoljungberg/warning-freeKasper Timm Hansen2016-02-292-9/+9
|\ \ \ \ | | | | | | | | | | Address ruby warnings
| * | | | Address ruby warningsTeo Ljungberg2016-02-292-9/+9
|/ / / / | | | | | | | | | | | | | | | | - Ambiguous first argument - Mismatched indentation
* | | | Merge pull request #22591 from gregmolnar/sslKasper Timm Hansen2016-02-282-2/+13
|\ \ \ \ | | | | | | | | | | add `constraint_to` option to SSL middleware
| * | | | add `constraint_to` option to SSL middlewareGreg Molnar2016-02-282-2/+13
| | | | |
* | | | | Merge pull request #23929 from ↵Kasper Timm Hansen2016-02-281-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/update-deprecation-message-for-app-namespace Update deprecation message shown when tasks from rails namespace are run
| * | | | | Update deprecation message shown when tasks from rails namespace are runPrathamesh Sonpatki2016-02-271-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge pull request #23946 from prathamesh-sonpatki/fix-ac-guideप्रथमेश Sonpatki2016-02-281-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix formatting in Action Cable guide [ci skip]
| * | | | | Fix formatting in Action Cable guide [ci skip]Prathamesh Sonpatki2016-02-281-0/+1
|/ / / / /
* | | | | Merge pull request #23945 from prathamesh-sonpatki/rm-merge-conflictDavid Heinemeier Hansson2016-02-281-5/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix merge conflict in Action Cable guide [ci skip]
| * | | | | Fix merge conflict in Action Cable guide [ci skip]Prathamesh Sonpatki2016-02-281-5/+2
|/ / / / /
* | | | | Further cleanup of the cable guideDavid Heinemeier Hansson2016-02-281-100/+51
| | | | |
* | | | | Merge pull request #23943 from y-yagi/remove_rake_wordप्रथमेश Sonpatki2016-02-282-4/+4
|\ \ \ \ \ | | | | | | | | | | | | remove "rake" word [ci skip]
| * | | | | remove "rake" word [ci skip]yuuji.yaginuma2016-02-282-4/+4
| | |/ / / | |/| | |
* | | | | Merge pull request #23944 from prathamesh-sonpatki/ac-guide-fixesप्रथमेश Sonpatki2016-02-281-25/+25
|\ \ \ \ \ | | | | | | | | | | | | Fix typos in Action Cable guide [ci skip]
| * | | | | Fix typos in Action Cable guide [ci skip]Prathamesh Sonpatki2016-02-281-25/+25
|/ / / / /
* | | | | Merge pull request #23176 from davidkuhta/patch-1David Heinemeier Hansson2016-02-281-0/+671
|\ \ \ \ \ | | | | | | | | | | | | Guide for Action Cable
| * | | | | Header TypoDavid Kuhta2016-02-231-1/+1
| | | | | |
| * | | | | `stream_for` exampleDavid Kuhta2016-02-231-0/+15
| | | | | |
| * | | | | Explicitly denote that channel.rb is a default file.David Kuhta2016-02-231-2/+2
| | | | | |
| * | | | | Change ActionCable.server.broadcast to XChannel.broadcast_toDavid Kuhta2016-02-231-10/+7
| | | | | | | | | | | | | | | | | | Using broadcast directly off server is not recommended
| * | | | | Create action_cable_overview.md resolves #23176 [ci skip]David Kuhta2016-02-141-0/+659
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails Guide for Action Cable Added content from README Pull additional information from Action Cable README and restructured Client/Server elements Update to list numbering Switched from list numbers to headings in the examples Change AppearancesChannel to AppearanceChannel Word missing fixed missing word. Removed Mistaken nesting of Channel class Removed nesting of ChatChannel and AppearanceChannel from within ApplicationChannel Module. (Copy&Paste error) Incorporated first round of comments 1. Capitalize "action cable" 2. Separated "Consumers require... via JavaScript" into two sentences 3. Minor typographical correction (remember...) 4. Extra backtick 5. Revised text which implied Redis was the exclusive storage adapter to reflect it's position as default. 6. Revised reference to denote correct config file location: config/cable.yml 7. Added adapter: redis to environment configuration blocks 8. Capitalized "R" for "Rack" 9. Revised syntax for routing to reflect the hash syntax. (to: NOT :to =>) 10. Removed reference to Action Cable being separate from Rails. 11. Began revision for adapter API [I believe this requires a reformatting of the 'Redis' portion of the configuration section to simply "Storage Adapters"] 12. Celluloid -> Concurrent-ruby Moved errant grave mark [ci skip] Reordered "In App" above "Standalone" [ci skip] Reordered to reflect "In App" as preferable to "Standalone" Action Cable Deployment [ci skip] Removed paragraph that alludes to Action Cable not being able to run in the same process as Rails. Removed EM reference and updated deployment [ci skip] Removed explicit multi-threaded server dependency reference [ci skip] Revised Configuration and fixed typos [ci skip] Switched Lifecycle Graphic for Detailed Description [ci skip] Switched from Lifecycle graphic to detailed description to facilitate revision and maintainability in the future. Capitalized Heading (typo) [ci skip] Implemented merged commits from README [ci skip] Pulled over all (or at least I believe all) merged commits from README. (Dec 14, 2015 - Feb 11, 2016) Editorial - Capitalize WebSockets [ci skip] Reformated lines to ~75 characters [ci skip]
* | | | | | Merge pull request #23811 from iamvery/string-channelDavid Heinemeier Hansson2016-02-285-1/+37
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Ensure actioncable behaves as expected with non-string queues
| * | | | | Update changelogJay Hayes2016-02-241-0/+4
| | | | | |
| * | | | | Ensure server broadcasts are to string queue namesJay Hayes2016-02-242-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to the channel streaming side, these values must be strings for ActionCable to behave as expected. The conversion will allow users to send string-convertible values and get the expected behavior.
| * | | | | Convert stream broadcasting to a stringJay Hayes2016-02-242-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionCable does some things behind the scenes that expects these "broadcasting"s or "channel"s to be strings. However it's not immediately obvious that the value must be a string. So adding this conversion ensures things work as expected.
| * | | | | whitespaceJay Hayes2016-02-241-1/+0
| | | | | |
* | | | | | Merge pull request #23937 from y-yagi/use_app_updateArun Agrawal2016-02-281-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | use `app:update` instead of deprecated `rails:update` [ci skip]
| * | | | | | use `app:update` instead of deprecated `rails:update` [ci skip]yuuji.yaginuma2016-02-281-2/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | `rails:update` was deprecated in 6fb31638c8b61731103d4963272755b217a2df87
* | | | | | Merge pull request #23933 from HayleyCAnderson/ha-action-cable-docs-fixesJon Moss2016-02-275-15/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] Add small Action Cable documentation fixes
| * | | | | | Add small Action Cable documentation fixesHayley Anderson2016-02-275-15/+15
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | * Fix typos/grammar errors * Make capitalization/naming consistent
* | | | | | Update docs to point to new update task.Arthur Neves2016-02-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This guides were pointing to this command `rails app:update`, which I tried to run, but it didnt worked. I think the right command is `rails rails:update` instead. Also thats the name of the rake task. Also I removed the `Rake` word from the title, as we run it using `rails` bin now. cc @kaspth [skip ci]
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-07 17:01:13 +0000