Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #25182 from rails/remove-public-files-for-api-apps | David Heinemeier Hansson | 2016-05-28 | 2 | -1/+18 |
|\ | | | | | Remove public/ files for API apps | ||||
| * | Remove public/ files for API apps | Prathamesh Sonpatki | 2016-05-28 | 2 | -1/+18 |
| | | | | | | | | - Fixes #25180 | ||||
* | | Redirects are to urls, not paths | David Heinemeier Hansson | 2016-05-28 | 1 | -3/+3 |
| | | |||||
* | | The first comment does not explain anything that the code doesnt and the ↵ | David Heinemeier Hansson | 2016-05-28 | 1 | -2/+0 |
| | | | | | | | | second is now irrelevant with the dedicated API mode | ||||
* | | Boil down custom Action Cable configuration to a single block | David Heinemeier Hansson | 2016-05-28 | 1 | -4/+2 |
|/ | |||||
* | Merge pull request #25177 from y-yagi/fix_class_name | प्रथमेश Sonpatki | 2016-05-28 | 2 | -2/+2 |
|\ | | | | | fix incorrect class name [ci skip] | ||||
| * | fix incorrect class name [ci skip] | yuuji.yaginuma | 2016-05-28 | 2 | -2/+2 |
|/ | |||||
* | Merge pull request #25176 from kamipo/use_add_index_in_guides | Vipul A M | 2016-05-27 | 1 | -1/+1 |
|\ | | | | | Use `add_index` instead of `execute` in guides [ci skip] | ||||
| * | Use `add_index` instead of `execute` in guides [ci skip] | Ryuta Kamizono | 2016-05-28 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #25172 from imtayadeway/activejob/after-enqueue-doc | Vipul A M | 2016-05-27 | 1 | -2/+2 |
|\ | | | | | [ci skip] Reword doc for around_enqueue callback | ||||
| * | [ci skip] Reword doc for around_enqueue callback | Tim Wade | 2016-05-27 | 1 | -2/+2 |
|/ | | | | | | Taken literally, the documentation suggests that the callback gets called twice (before and after enqueueing). By wording it similarly to that of around_perform this confusion is avoided. | ||||
* | Merge pull request #25171 from matkoniecz/cosmetic_updates | Vipul A M | 2016-05-27 | 1 | -1/+1 |
|\ | | | | | cometic updates to security guide - fixes #25058 [ci skip] | ||||
| * | cometic updates to security guide - fixes #25058 [ci skip] | Mateusz Konieczny | 2016-05-27 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #25160 from kamipo/remove_association_for_table | Rafael França | 2016-05-27 | 1 | -6/+0 |
|\ | | | | | Remove unused `association_for_table` private method | ||||
| * | Remove unused `association_for_table` private method | Ryuta Kamizono | 2016-05-27 | 1 | -6/+0 |
| | | | | | | | | `association_for_table` is unused since 50a8cdf. | ||||
* | | Merge pull request #25162 from willnet/fix-guides | प्रथमेश Sonpatki | 2016-05-27 | 1 | -1/+1 |
|\ \ | | | | | | | [ci skip] Fix ActionCable Guides | ||||
| * | | [ci skip] Fix ActionCable Guides | willnet | 2016-05-27 | 1 | -1/+1 |
| |/ | | | | | | | Default worker pool size was changed from 100 to 4 at #24376 | ||||
* | | Merge pull request #25164 from ↵ | Kasper Timm Hansen | 2016-05-27 | 1 | -2/+3 |
|\ \ | | | | | | | | | | | | | y-yagi/add_missing_as_option_to_deprecation_message add missing `as` to request kwargs of `ActionDispatch::IntegrationTest` | ||||
| * | | add missing `as` to request kwargs of `ActionDispatch::IntegrationTest` | yuuji.yaginuma | 2016-05-27 | 1 | -2/+3 |
| |/ | | | | | | | Follow up to #21671 | ||||
* | | Merge pull request #25157 from maclover7/jm-23930-add-tests | Kasper Timm Hansen | 2016-05-27 | 1 | -0/+8 |
|\ \ | |/ |/| | Add test for `delegate_missing_to` where method doesn't exist | ||||
| * | Add test for `delegate_missing_to` where method doesn't exist | Jon Moss | 2016-05-26 | 1 | -0/+8 |
| | | |||||
* | | Merge pull request #25158 from xhpwn/master | Arun Agrawal | 2016-05-27 | 1 | -1/+1 |
|\ \ | |/ |/| | Bash markdown syntax | ||||
| * | Bash markdown syntax | Anubhav Saxena | 2016-05-27 | 1 | -1/+1 |
|/ | | | Added 'sh' for markdown formatting as bash. | ||||
* | Merge pull request #25146 from maclover7/fix-25128 | Sean Griffin | 2016-05-26 | 2 | -1/+20 |
|\ | | | | | Fix `has_one` `enum` `where` queries | ||||
| * | Fix `has_one` `enum` `where` queries | Jon Moss | 2016-05-26 | 2 | -1/+20 |
| | | | | | | | | Fixes #25128 | ||||
* | | Merge pull request #25153 from jaredbeck/docs_re_assoc_persist | Vipul A M | 2016-05-26 | 1 | -4/+4 |
|\ \ | |/ |/| | Docs: Clarify when assoc. methods persist [ci skip] | ||||
| * | Docs: Clarify when assoc. methods persist | Jared Beck | 2016-05-26 | 1 | -4/+4 |
|/ | | | | | | | Because I can never remember if `collection_singular_ids=` persists or not (it does). [ci skip] | ||||
* | autoloading guide: specify autoload paths are set when the app boots [ci skip] | Xavier Noria | 2016-05-26 | 1 | -3/+4 |
| | |||||
* | Merge pull request #25139 from vipulnsward/revert-bundler-version | Jeremy Daer | 2016-05-25 | 1 | -1/+1 |
|\ | | | | | | | Revert back to a compatible bundler version | ||||
| * | Revert back to a compatible bundler version | Vipul A M | 2016-05-25 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #25138 from ysksn/test_delegation | Rafael França | 2016-05-25 | 1 | -0/+15 |
|\ \ | |/ |/| | Add tests for keyword arg to: for Module#delegate | ||||
| * | Add tests for keyword arg to: for Module#delegate | Yosuke Kabuto | 2016-05-25 | 1 | -0/+15 |
| | | |||||
* | | CI: run Action Cable browser tests in Sauce Labs | Jon Moss | 2016-05-25 | 6 | -3/+61 |
|/ | | | | | | | | Allow failures until test runs are consistently stable, not hanging. Closes #24943. Signed-off-by: Jeremy Daer <jeremydaer@gmail.com> | ||||
* | Merge pull request #25134 from malept/consistent-hash-examples | Jon Moss | 2016-05-24 | 1 | -6/+6 |
|\ | | | | | Normalize whitespace for Hash#compact documentation | ||||
| * | Normalize whitespace for Hash#compact documentation [ci skip] | Mark Lee | 2016-05-24 | 1 | -6/+6 |
|/ | | | | This is a similar change that occurred for Hash#except in #21087. | ||||
* | Don't delegate to private methods of the targer | Rafael Mendonça França | 2016-05-24 | 2 | -1/+19 |
| | | | | And make sure that it doesn't even try to call the method in the target. | ||||
* | Merge pull request #25119 from javan/actioncable/blade-build | Rafael França | 2016-05-24 | 14 | -59/+20 |
|\ | | | | | Build action_cable.js with Blade | ||||
| * | Remove package:clean task | Javan Makhmali | 2016-05-24 | 10 | -10/+0 |
| | | | | | | | | Introduced in d6f2000a67cc63aa67414c75ce77de671824ec52 and was only used by Action Cable. Now handled by Action Cable’s assets:compile task. | ||||
| * | Build action_cable.js with Blade | Javan Makhmali | 2016-05-24 | 5 | -50/+21 |
| | | |||||
* | | Merge pull request #23930 from gsamokovarov/module-delegate-missing-to | Rafael Mendonça França | 2016-05-24 | 3 | -1/+129 |
|\ \ | | | | | | | | | | Introduce Module#delegate_missing_to | ||||
| * | | Introduce Module#delegate_missing_to | Genadi Samokovarov | 2016-02-27 | 3 | -1/+129 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building decorators, a common pattern may emerge: class Partition def initialize(first_event) @events = [ first_event ] end def people if @events.first.detail.people.any? @events.collect { |e| Array(e.detail.people) }.flatten.uniq else @events.collect(&:creator).uniq end end private def respond_to_missing?(name, include_private = false) @events.respond_to?(name, include_private) end def method_missing(method, *args, &block) @events.send(method, *args, &block) end end With `Module#delegate_missing_to`, the above is condensed to: class Partition delegate_missing_to :@events def initialize(first_event) @events = [ first_event ] end def people if @events.first.detail.people.any? @events.collect { |e| Array(e.detail.people) }.flatten.uniq else @events.collect(&:creator).uniq end end end David suggested it in #23824. | ||||
* | | | Merge pull request #25131 from javierhonduco/javierhonduco/clone_depth_to_1 | Rafael França | 2016-05-24 | 1 | -0/+3 |
|\ \ \ | | | | | | | | | Cloning depth set to 1 | ||||
| * | | | Cloning depth set to 1 | Javier Honduvilla Coto | 2016-05-24 | 1 | -0/+3 |
|/ / / | |||||
* | | | Merge pull request #25130 from xhpwn/master | Rafael França | 2016-05-24 | 2 | -5/+5 |
|\ \ \ | | | | | | | | | Improved commands in README with markdown formatting | ||||
| * | | | Minor comment language correction. | Anubhav Saxena | 2016-05-24 | 1 | -2/+2 |
| | | | | |||||
| * | | | Fixing commands with Markdown formatting | Anubhav Saxena | 2016-05-24 | 1 | -3/+3 |
|/ / / | | | | | | | Adding '$' to emulate shell syntax | ||||
* | | | Remove version header from railties CHANGELOG.md (#25122) | Jon Moss | 2016-05-24 | 1 | -2/+0 |
| | | | | | | | | | [ci skip] | ||||
* | | | Merge pull request #25061 from eugeneius/rails_max_threads_mysql_sqlite | Richard Schneeman | 2016-05-24 | 10 | -2/+10 |
|\ \ \ | |_|/ |/| | | Use RAILS_MAX_THREADS as pool size on all adapters | ||||
| * | | Use RAILS_MAX_THREADS as pool size on all adapters | Eugene Kenny | 2016-05-24 | 10 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | When RAILS_MAX_THREADS is set, the postgresql adapter uses it as the connection pool size, so that there are always enough connections available to serve Action Cable requests. The same logic applies when using any other adapter. | ||||
* | | | Merge pull request #25126 from bquorning/this-is-not-an-alias | Vipul A M | 2016-05-24 | 1 | -2/+0 |
|\ \ \ | | | | | | | | | [] and read_attribute are not aliases [ci skip] |