aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move all nodoc methods to the private sectionRafael Mendonça França2015-11-241-43/+43
| | | | Since they are nodoc there is no need to be protected.
* Put all private method togetherRafael Mendonça França2015-11-241-36/+35
|
* Avoid mutating the headers hashRafael Mendonça França2015-11-241-2/+3
| | | | | We are already filtering the keys in the assign_headers_to_message method so we can just update the filter.
* nodoc in the private methodRafael Mendonça França2015-11-241-1/+1
|
* Merge pull request #22120 from hnatt/refactor-actionmailerRafael Mendonça França2015-11-241-55/+59
|\ | | | | | | Refactor ActionMailer::Base
| * Rename ActionMailer::Base#class_from_value -> observer_class_forhnatt2015-10-301-4/+4
| |
| * Don't mutate headers in ActionMailer::Base#collect_responses_from_templateshnatt2015-10-301-2/+2
| |
| * Pass message as argument to ActionMailer::Base#assign_headers_to_messagehnatt2015-10-301-4/+5
| |
| * Fix indentation in ActionMailer::Base#collect_responses_from_templateshnatt2015-10-291-5/+5
| |
| * Refactor out headers to message assignment from ActionMailer::Base#mailhnatt2015-10-291-3/+6
| |
| * Use attr_internal in ActionMailer::Base#mail instead of local var for messagehnatt2015-10-291-11/+9
| |
| * Refactor out defaults handling from ActionMailer::Base#mailhnatt2015-10-291-9/+15
| |
| * Refactor ActionMailer::Base#collect_responseshnatt2015-10-291-16/+16
| |
| * Reduce code duplication in ActionMailer::Base#register_observer and ↵hnatt2015-10-291-16/+12
| | | | | | | | #register_interceptor
* | Merge pull request #22287 from dharamgollapudi/patch-2Rafael França2015-11-241-2/+1
|\ \ | | | | | | Move the desc one level up
| * | Move the desc one level up Dharam Gollapudi2015-11-131-2/+1
| | | | | | | | | Make the task visible (from rake -T) by moving the desc one level up
* | | Merge pull request #22390 from ↵Rafael França2015-11-231-2/+2
|\ \ \ | | | | | | | | | | | | | | | | jacobbednarz/update-valgrind-docs-for-macosx-support Remove valgrind note about linux only support
| * | | Remove valgrind note about linux only supportJacob Bednarz2015-11-241-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | Update the valgrind debugging documentation to remove the notes about being linux only as 3.11.0[1] introduces preliminary support for Mac OSX 10.11 (El Capitan). [1]: http://valgrind.org/docs/manual/dist.news.html
* | | Merge pull request #22272 from y-yagi/remove_test_files_in_plugin_gemspecEileen M. Uchitelle2015-11-231-3/+0
|\ \ \ | | | | | | | | don't package test files in plugin gemspec
| * | | don't package test files in plugin gemspecyuuji.yaginuma2015-11-121-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In rails engine, there is a dummy application under test, the size of the test file is increased. However, there is no need test files for most users, I think it good to have so as not included by default.
* | | | Merge pull request #22388 from ↵Sean Griffin2015-11-233-9/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | kamipo/set_field_encoding_is_only_needed_for_mysql_adapter `set_field_encoding` is only needed for `MysqlAdapter`
| * | | | `set_field_encoding` is only needed for `MysqlAdapter`Ryuta Kamizono2015-11-243-9/+8
| | | | | | | | | | | | | | | | | | | | Not needed for `Mysql2Adapter` and `AbstractMysqlAdapter`.
* | | | | Fix more test failures caused by #21000Sean Griffin2015-11-231-1/+5
| | | | |
* | | | | Fix test failures caused by #21000Sean Griffin2015-11-231-0/+1
| | | | |
* | | | | Revert "Merge pull request #18446 from ↵Sean Griffin2015-11-234-137/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cloud8421/actionmailer-unregister-interceptor" This reverts commit 65a61ab7c370d2894c11ce276725f723a5c9c111, reversing changes made to 14314ca18302f18c3d8bb7a63e9f71ac4c2290c2. This PR broke the build
* | | | | Merge pull request #21000 from twalpole/find_or_parameter_issuesSean Griffin2015-11-237-44/+101
|\ \ \ \ \ | | | | | | | | | | | | Update and fix forbidden attributes test issues caused by AC::Parameters change
| * | | | | Update and fix forbidden attributes testsThomas Walpole2015-11-037-44/+101
| | | | | | | | | | | | | | | | | | | | | | | | Add AC::Parameters tests for WhereChain#not
* | | | | | Merge pull request #22385 from headius/each_object_singleton_testSean Griffin2015-11-231-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Test if each_object(singleton_class) works, since JRuby added it.
| * | | | | | Test if each_object(singleton_class) works, since JRuby added it.Charles Oliver Nutter2015-11-231-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22376. JRuby 9.0.5.0 will support ObjectSpace.each_object against a class's singleton class, since that's essentially just walking an internal subclasses structure we already maintain. This test was too narrow, requiring that each_object support an arbitrary class but only actually needing it to work against a class's singleton. This improves performance of Class.descendants by nearly two orders of magnitude when run against JRuby 9.0.5.0: ```ruby 5.times { puts Benchmark.measure { 100_000.times { Numeric.descendants } } } ``` Before: ``` 11.510000 0.140000 11.650000 ( 10.082384) 9.990000 0.020000 10.010000 ( 9.931233) 10.520000 0.040000 10.560000 ( 10.502978) 10.290000 0.030000 10.320000 ( 10.276027) 10.000000 0.030000 10.030000 ( 9.942429) ``` After: ``` 1.380000 0.040000 1.420000 ( 0.365850) 0.210000 0.000000 0.210000 ( 0.149574) 0.180000 0.020000 0.200000 ( 0.141094) 0.140000 0.000000 0.140000 ( 0.140634) 0.190000 0.010000 0.200000 ( 0.147962) ```
* | | | | | | Merge pull request #17013 from gsamokovarov/fix-null-resolverSean Griffin2015-11-231-2/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix improper value types used to instantiate a Template in AV::NullResol...
| * | | | | | | Fix improper value types used to instantiate a Template in AV::NullResolverGenadi Samokovarov2014-09-221-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While trying to provide a reproducible test for #17008 I stumbled on this one. Seems to be quite an old piece of code, but its definitely useful in situations like the reproducible test cases like the one above.
* | | | | | | | Merge pull request #17928 from sergey-alekseev/remove-unused-form-data-methodSean Griffin2015-11-232-3/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | write a test for `#form_data?`Sergey Alekseev2015-03-312-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The initial attempt was to remove the method at all in https://github.com/sergey-alekseev/rails/commit/4926aa68c98673e7be88a2d2b57d72dc490bc71c. The method overrides Rack's `#form_data?` https://github.com/rack/rack/blob/6f8808d4201e68e4bd780441b3b7bb3ee6d1f43e/lib/rack/request.rb#L172-L184. Which may have some incorrect implementation actually. `type.nil?` isn't possible I suppose. I'll check.
* | | | | | | | | Merge pull request #18446 from cloud8421/actionmailer-unregister-interceptorSean Griffin2015-11-234-19/+137
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | ActionMailer::Base can unregister interceptor(s).
| * | | | | | | | ActionMailer::Base can unregister interceptor(s).Claudio Ortolina2015-01-314-19/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One or multiple mail interceptors can be unregistered using `ActionMailer::Base.unregister_interceptors` or `ActionMailer::Base.unregister_interceptor`. For preview interceptors, it's possible to use `ActionMailer::Base.unregister_preview_interceptors` or `ActionMailer::Base.unregister_preview_interceptor`. Refactors logic to constantize a string/symbol into separate method.
* | | | | | | | | Merge pull request #22372 from greysteil/clearer-ip-spoofing-commentRichard Schneeman2015-11-231-7/+15
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Clearer comment and variable name on IP spoofing
| * | | | | | | | | Clearer comment and variable name on IP spoofingGrey Baker2015-11-221-7/+15
| | | | | | | | | |
* | | | | | | | | | Remove blanket array delegation from `Relation`Sean Griffin2015-11-232-20/+2
| |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As was pointed out by #17128, our blacklist of mutation methods was non-exhaustive (and would need to be kept up to date with each new version of Ruby). Now that `Relation` includes `Enumerable`, the number of methods that we actually need to delegate are pretty small. As such, we can change to explicitly delegating the few non-mutation related methods that `Array` has which aren't on `Enumerable`
* | | | | | | | | Merge pull request #22374 from DNNX/patch-1Rafael França2015-11-231-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Simplify `RailsGuides::Generator#select_only` a bit
| * | | | | | | | | Simplify `RailsGuides::Generator#select_only` a bitViktar Basharymau2015-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The main goal is to improve readability, but as a side effect this commit makes the method a bit faster.
* | | | | | | | | | Merge pull request #22379 from yui-knk/translating_rails_guidesRafael França2015-11-231-0/+36
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ci skip] Add `Translating Rails Guides` to contributing_to_ruby_on_r…
| * | | | | | | | | | [ci skip] Add `Translating Rails Guides` to contributing_to_ruby_on_railsyui-knk2015-11-231-0/+36
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docrails is private now (6cb1b6724c313c608cf4063fc22886faa19df9be), anyone who does not have access right to docrails can't read "Translating Rails Guides" in wiki of docrails. To prevent someone from giving up to translate, publish them on Rails Guide.
* | | | | | | | | | Merge pull request #22380 from wjessop/fix_race_in_aj_integration_testsSean Griffin2015-11-233-7/+18
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Fix race condition testing for job execution order
| * | | | | | | | | Fix race condition testing for job execution orderWill Jessop2015-11-233-7/+18
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On most filesystems file ctime is limited to 1 second granularity, which means that on faster computers multiple simple jobs (for instance dummy TestJob) can finish within the same second. The execution order test in ActiveJob integration tests relies on multiple TestJobs writing files then comparing the ctime. As a result integration tests would sometimes fail as the ctime of the files written by these TestJobs could have coincidental ctimes making the comparison for job order fail. This commit adds a far more precise execution time (to the extent that the Ruby Time class allows) to the file created by TestJob, and updates the execution order assertion to use it, removing the race condition.
* | | | | | | | | Bring back `===` stubbing in `time_zone_select` test.Kasper Timm Hansen2015-11-221-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Erroneously removed in 58910dc7. The stubbing was a regression test to ensure `time_zone_select` wasn't implemented with `grep`. Rename the test and add a comment to make the intent clearer.
* | | | | | | | | Ditch `each_with_index` for `each`.Kasper Timm Hansen2015-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We never touch the index, so don't bother.
* | | | | | | | | Don't cache fake time zones.Kasper Timm Hansen2015-11-221-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling `test_time_zone_select_with_priority_zones_as_regexp` it would define `=~` on the fake zones, but it would never be cleaned up because of the zone cache. Nuke it so `test_time_zone_select_with_priority_zones_as_regexp_using_grep_finds_no_zones` accidentally find any zones because of `=~` being implemented.
* | | | | | | | | Merge pull request #21615 from ronakjangir47/actionViewpart2Kasper Timm Hansen2015-11-225-79/+133
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Removed Mocha from Action View
| * | | | | | | | Removed Mocha from Action ViewRonak Jangir2015-09-235-79/+133
| | | | | | | | |
* | | | | | | | | removes the mutex around `changed`Xavier Noria2015-11-221-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method needs to ensure that if a change happens, it is going to be registered. With this refactor suggested by @matthewd race conditions do not matter because if no file is watched, nothing is done. And as long as some invocation sets the flag to true, it will stay true. The refactor leaves a race condition in which two simultaneous threads that watch some of the files passed do the actual work in `any?`, whereas the mutex guaranteed that was done at most once. But this is considered to be a better tradeoff.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 01:40:17 +0000