aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #25146 from maclover7/fix-25128Sean Griffin2016-05-262-1/+20
|\ \ \ | | | | | | | | Fix `has_one` `enum` `where` queries
| * | | Fix `has_one` `enum` `where` queriesJon Moss2016-05-262-1/+20
| | | | | | | | | | | | | | | | Fixes #25128
* | | | Merge pull request #25153 from jaredbeck/docs_re_assoc_persistVipul A M2016-05-261-4/+4
|\ \ \ \ | |/ / / |/| | | Docs: Clarify when assoc. methods persist [ci skip]
| * | | Docs: Clarify when assoc. methods persistJared Beck2016-05-261-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 Noria2016-05-261-3/+4
| | |
* | | Merge pull request #25139 from vipulnsward/revert-bundler-versionJeremy Daer2016-05-251-1/+1
|\ \ \ | | | | | | | | | | | | Revert back to a compatible bundler version
| * | | Revert back to a compatible bundler versionVipul A M2016-05-251-1/+1
| | | |
* | | | Merge pull request #25138 from ysksn/test_delegationRafael França2016-05-251-0/+15
|\ \ \ \ | |/ / / |/| | | Add tests for keyword arg to: for Module#delegate
| * | | Add tests for keyword arg to: for Module#delegateYosuke Kabuto2016-05-251-0/+15
| |/ /
* / / CI: run Action Cable browser tests in Sauce LabsJon Moss2016-05-256-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-examplesJon Moss2016-05-241-6/+6
|\ \ | | | | | | Normalize whitespace for Hash#compact documentation
| * | Normalize whitespace for Hash#compact documentation [ci skip]Mark Lee2016-05-241-6/+6
|/ / | | | | | | This is a similar change that occurred for Hash#except in #21087.
* | Don't delegate to private methods of the targerRafael Mendonça França2016-05-242-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-buildRafael França2016-05-2414-59/+20
|\ \ | | | | | | Build action_cable.js with Blade
| * | Remove package:clean taskJavan Makhmali2016-05-2410-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 BladeJavan Makhmali2016-05-245-50/+21
| | |
* | | Merge pull request #23930 from gsamokovarov/module-delegate-missing-toRafael Mendonça França2016-05-243-1/+129
|\ \ \ | | | | | | | | | | | | Introduce Module#delegate_missing_to
| * | | Introduce Module#delegate_missing_toGenadi Samokovarov2016-02-273-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_1Rafael França2016-05-241-0/+3
|\ \ \ \ | | | | | | | | | | Cloning depth set to 1
| * | | | Cloning depth set to 1Javier Honduvilla Coto2016-05-241-0/+3
|/ / / /
* | | | Merge pull request #25130 from xhpwn/masterRafael França2016-05-242-5/+5
|\ \ \ \ | | | | | | | | | | Improved commands in README with markdown formatting
| * | | | Minor comment language correction.Anubhav Saxena2016-05-241-2/+2
| | | | |
| * | | | Fixing commands with Markdown formattingAnubhav Saxena2016-05-241-3/+3
|/ / / / | | | | | | | | Adding '$' to emulate shell syntax
* | | | Remove version header from railties CHANGELOG.md (#25122)Jon Moss2016-05-241-2/+0
| | | | | | | | | | | | [ci skip]
* | | | Merge pull request #25061 from eugeneius/rails_max_threads_mysql_sqliteRichard Schneeman2016-05-2410-2/+10
|\ \ \ \ | |_|/ / |/| | | Use RAILS_MAX_THREADS as pool size on all adapters
| * | | Use RAILS_MAX_THREADS as pool size on all adaptersEugene Kenny2016-05-2410-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-aliasVipul A M2016-05-241-2/+0
|\ \ \ \ | | | | | | | | | | [] and read_attribute are not aliases [ci skip]
| * | | | [] and read_attribute are not aliases [ci skip]Benjamin Quorning2016-05-241-2/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | The `#[]` method *used to be* an alias of `#read_attribute`, but since Rails 4 (10f6f90d9d1bbc9598bffea90752fc6bd76904cd), it will raise an exception for missing attributes. Saying that it is an alias is confusing.
* | | | Revert "Add default exceptions affected by suppress (#25099)"Rafael Mendonça França2016-05-232-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 28492204ee59a5aca2f3bc7b161d45724552686d. Reason: `suppress` without an argument doesn't actually tell what is supressing. Also, it can be confused with ActiveRecord::Base#suppress.
* | | | Add default exceptions affected by suppress (#25099)Alexey Zapparov2016-05-232-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add default exceptions affected by suppress suppress { do_something_that_might_fail } # instead of begin do_something_that_might_fail rescue end # or do_something_that_might_fail rescue nil * Do not add default exceptions list constant [Rafael Mendonça França + Alexey Zapparov]
* | | | Merge pull request #25114 from y-yagi/remove_qualified_const_from_guideJon Moss2016-05-231-71/+0
|\ \ \ \ | | | | | | | | | | remove deprecated `Module#qualified_const_` from guide [ci skip]
| * | | | remove deprecated `Module#qualified_const_` from guide [ci skip]yuuji.yaginuma2016-05-231-71/+0
| | | | | | | | | | | | | | | | | | | | Follow up to #17845.
* | | | | Merge pull request #25110 from andrii/fix_scaffold_cssRafael França2016-05-231-8/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix and optimize scaffold CSS
| * | | | | Fix and optimize scaffold CSS [ci skip]Andrii Ponomarov2016-05-221-8/+4
| |/ / / /
* / / / / Respect `log_warning_on_csrf_failure` setting for all CSRF failuresMatthew Caruana Galizia2016-05-232-1/+34
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CSRF verification for non-XHR GET requests (cross-origin `<script>` tags) didn't check this flag before logging failures. Setting `config.action_controller.log_warning_on_csrf_failure = false` now disables logging for these CSRF failures as well. Closes #25086. Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
* | | | Remove Blade gem dependencyVipul A M2016-05-213-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apps that depend on Action Cable don't need Blade for app development, so we can remove the gem dependency. We do need Blade for Action Cable dev, so we bundle it in the Gemfile. Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
* | | | Merge pull request #25076 from jeroenvisser101/keep-to-max-lengthSean Griffin2016-05-212-2/+4
|\ \ \ \ | | | | | | | | | | Change comments to not exceed 80 characters
| * | | | Change comments to not exceed 80 charactersJeroen Visser2016-05-192-2/+4
| | | | | | | | | | | | | | | | | | | | Other generated files do keep to this, but action cable doesn't.
* | | | | Merge pull request #25101 from maclover7/jm-rm-space-1Kasper Timm Hansen2016-05-211-5/+5
|\ \ \ \ \ | | | | | | | | | | | | Remove space, properly italicize
| * | | | | Remove space, properly italicizeJon Moss2016-05-211-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Difference in rendering --> https://gist.github.com/maclover7/a50ff9231eb825c39c77cd5858af6d9a [ci skip]
* | | | | | Merge pull request #25100 from maclover7/jm-add-backticksKasper Timm Hansen2016-05-211-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add backticks to `config/secrets.yml`
| * | | | | Add backticks to `config/secrets.yml`Jon Moss2016-05-211-1/+1
|/ / / / / | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #24850 from maclover7/jm-actioncable-docsJon Moss2016-05-212-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Pass over Action Cable docs
| * | | | | Pass over Action Cable docsJon Moss2016-05-212-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #24170 from maclover7/fix-24168Rafael França2016-05-211-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Un-hide helper and assets options for controller generator
| * | | | | | Un-hide helper and assets options for controller generatorJon Moss2016-03-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These options were hidden via 9b36cf0fa4cbdcb2e2072ef1b8179a98b13efce3, but these options have tests written for them, and I believe that they are supposed to be public API. Fixes #24168.
* | | | | | | Merge pull request #24862 from maclover7/jm-ar-fixesRafael França2016-05-211-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add missing `the`
| * | | | | | | Add missing `the`Jon Moss2016-05-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge pull request #25093 from Erol/activerecord-transaction-serialization-errorRafael França2016-05-216-3/+163
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Introduce AR::TransactionSerializationError for transaction serialization failures or deadlocks
| * | | | | | | Add AR::TransactionSerializationError for transaction serialization failures ↵Erol Fornoles2016-05-216-3/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | or deadlocks
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 00:53:53 +0000