aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix more assertion counts.Kasper Timm Hansen2016-05-281-2/+2
| | | | Follow up to e45f388.
* Fix assertion count after 69e1bb52.Kasper Timm Hansen2016-05-281-2/+2
| | | | | | | | | | | | | | | When changing the generated integration tests to assert redirects with an absolute path this redirection check in `assert_redirected_to` against the absolute response location would now pass: https://github.com/rails/rails/blob/af245aaf3a1c447752a1b5895adddc66e5f73c00/actionpack/lib/action_dispatch/testing/assertions/response.rb#L55 Thus we'd break early instead of hitting `assert_operator` and have 2 fewer assertions per `assert_redirected_to` as `assert_operator` is composed of 2 assertions internally: https://github.com/seattlerb/minitest/blob/4e146b1515b19a5c474e39c174b037510f6dbc6e/lib/minitest/assertions.rb#L254-L258 Deduct 2 assertions for 2 redirects taking the expected count down by 4 in total for the two failing tests.
* Merge pull request #25182 from rails/remove-public-files-for-api-appsDavid Heinemeier Hansson2016-05-282-1/+18
|\ | | | | Remove public/ files for API apps
| * Remove public/ files for API appsPrathamesh Sonpatki2016-05-282-1/+18
| | | | | | | | - Fixes #25180
* | Redirects are to urls, not pathsDavid Heinemeier Hansson2016-05-281-3/+3
| |
* | The first comment does not explain anything that the code doesnt and the ↵David Heinemeier Hansson2016-05-281-2/+0
| | | | | | | | second is now irrelevant with the dedicated API mode
* | Boil down custom Action Cable configuration to a single blockDavid Heinemeier Hansson2016-05-281-4/+2
|/
* Merge pull request #25177 from y-yagi/fix_class_nameप्रथमेश Sonpatki2016-05-282-2/+2
|\ | | | | fix incorrect class name [ci skip]
| * fix incorrect class name [ci skip]yuuji.yaginuma2016-05-282-2/+2
|/
* Merge pull request #25176 from kamipo/use_add_index_in_guidesVipul A M2016-05-271-1/+1
|\ | | | | Use `add_index` instead of `execute` in guides [ci skip]
| * Use `add_index` instead of `execute` in guides [ci skip]Ryuta Kamizono2016-05-281-1/+1
|/
* Merge pull request #25172 from imtayadeway/activejob/after-enqueue-docVipul A M2016-05-271-2/+2
|\ | | | | [ci skip] Reword doc for around_enqueue callback
| * [ci skip] Reword doc for around_enqueue callbackTim Wade2016-05-271-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_updatesVipul A M2016-05-271-1/+1
|\ | | | | cometic updates to security guide - fixes #25058 [ci skip]
| * cometic updates to security guide - fixes #25058 [ci skip]Mateusz Konieczny2016-05-271-1/+1
|/
* Merge pull request #25160 from kamipo/remove_association_for_tableRafael França2016-05-271-6/+0
|\ | | | | Remove unused `association_for_table` private method
| * Remove unused `association_for_table` private methodRyuta Kamizono2016-05-271-6/+0
| | | | | | | | `association_for_table` is unused since 50a8cdf.
* | Merge pull request #25162 from willnet/fix-guidesप्रथमेश Sonpatki2016-05-271-1/+1
|\ \ | | | | | | [ci skip] Fix ActionCable Guides
| * | [ci skip] Fix ActionCable Guideswillnet2016-05-271-1/+1
| |/ | | | | | | Default worker pool size was changed from 100 to 4 at #24376
* | Merge pull request #25164 from ↵Kasper Timm Hansen2016-05-271-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.yaginuma2016-05-271-2/+3
| |/ | | | | | | Follow up to #21671
* | Merge pull request #25157 from maclover7/jm-23930-add-testsKasper Timm Hansen2016-05-271-0/+8
|\ \ | |/ |/| Add test for `delegate_missing_to` where method doesn't exist
| * Add test for `delegate_missing_to` where method doesn't existJon Moss2016-05-261-0/+8
| |
* | Merge pull request #25158 from xhpwn/masterArun Agrawal2016-05-271-1/+1
|\ \ | |/ |/| Bash markdown syntax
| * Bash markdown syntaxAnubhav Saxena2016-05-271-1/+1
|/ | | Added 'sh' for markdown formatting as bash.
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-17 16:32:43 +0000