aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #34907 from wildbit/actionmailbox-postmarkGeorge Claghorn2019-01-096-33/+197
|\ | | | | Add Postmark ingress support to ActionMailbox
| * Added Postmark ingress supportTomek Maszkowski2019-01-096-33/+197
| |
* | Merge pull request #34900 from gmcgibbon/fix_test_find_only_some_columnsEileen M. Uchitelle2019-01-091-2/+11
|\ \ | | | | | | Reset column info on original Topic in serialized attr test
| * | Reset column info on original Topic in serialized attr testGannon McGibbon2019-01-091-2/+11
| | | | | | | | | | | | | | | Call .reset_column_information on ::Topic in serialized attribute test so that attribute methods are safely undefined for all topics.
* | | Merge pull request #34692 from gmcgibbon/use_mail_delivery_job_in_6.0_defaultsRafael França2019-01-098-7/+58
|\ \ \ | | | | | | | | Move MailDeliveryJob default to 6.0 defaults
| * | | Fix legacy fallback for parameterized mailersGannon McGibbon2019-01-073-6/+13
| | | |
| * | | Move MailDeliveryJob default to 6.0 defaultsGannon McGibbon2019-01-075-1/+45
| | | |
* | | | Merge pull request #34899 from rails/speed-up-stepAaron Patterson2019-01-091-1/+4
|\ \ \ \ | |_|_|/ |/| | | Duration#coerce should always return a Scalar
| * | | Duration#coerce should always return a ScalarAaron Patterson2019-01-081-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | This speeds up Range.new(x, y).step(Duration).each { ... } Fixes #34888
* | | | Enable `Lint/UselessAssignment` cop to avoid unused variable warnings (#34904)Ryuta Kamizono2019-01-0915-25/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Enable `Lint/UselessAssignment` cop to avoid unused variable warnings Since we've addressed the warning "assigned but unused variable" frequently. 370537de05092aeea552146b42042833212a1acc 3040446cece8e7a6d9e29219e636e13f180a1e03 5ed618e192e9788094bd92c51255dda1c4fd0eae 76ebafe594fc23abc3764acc7a3758ca473799e5 And also, I've found the unused args in c1b14ad which raises no warnings by the cop, it shows the value of the cop.
* | | | Merge pull request #34860 from toshimaru/make-guides-sns-friendlyRyuta Kamizono2019-01-093-4/+18
|\ \ \ \ | | | | | | | | | | Make Ruby on Rails Guides SNS-friendly
| * | | | Add OG tags to layout.html.erbtoshimaru2019-01-093-4/+18
|/ / / /
* | | | Merge pull request #34903 from y-yagi/enable_deprecated_class_methods_copYuji Yaginuma2019-01-092-1/+4
|\ \ \ \ | | | | | | | | | | Enable `Lint/DeprecatedClassMethods` cop to avoid using deprecated methods
| * | | | Enable `Lint/DeprecatedClassMethods` cop to avoid using deprecated methodsyuuji.yaginuma2019-01-092-1/+4
|/ / / /
* | | | Merge pull request #34894 from hahmed/tames-params-wrapper-errorsKasper Timm Hansen2019-01-091-16/+17
|\ \ \ \ | | | | | | | | | | Capture parsing errors only for ActionController::ParamsWrapper#process_actions
| * | | | Capture parsing errors for ActionController::ParamsWrapper#process_actionHaroon Ahmed2019-01-081-16/+17
| | | | |
* | | | | Merge pull request #34885 from y-yagi/fixes_34780Yuji Yaginuma2019-01-092-4/+16
|\ \ \ \ \ | | | | | | | | | | | | Allow using combine the Cache-Control `public` and `no-cache` headers
| * | | | | Allow using combine the Cache-Control `public` and `no-cache` headersyuuji.yaginuma2019-01-072-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since #30367, if `no-cache` includes Cache-Control headers, special keys like `public`, `must-revalidate` are ignored. But in my understanding, `public` still need in case of want to cache authenticated pages. The authenticated pages to be cacheable, but still authenticated for every user, need to specify the `Cache-Control: public, no-cache`. For keys other than `public`, I did not know the case where it was necessary to use it in combination with `no-cache`, so I fixed that can be used only for `public`. Ref: https://www.mnot.net/cache_docs/#CACHE-CONTROL Fixes #34780.
* | | | | | Preserve Bundle configuration during app generation (#34755)Marco Costa2019-01-093-9/+33
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When generating a new rails application (rails new) using a custom template that includes gems from an authenticated source, the user has to provide credentials to bundler. One way to do this is by exporting environment variables, for example: export BUNDLE_GITHUB__COM=user:pass: provides credentials for bundler to fetch gems from github.com. The problem this PR addresses is that we are currently scrubs all /BUNDLE_.*/ environment variables by wrapping our system calls in Bundler.with_clean_env. We do this because we don't want our commands executed against the generated project to use the generator's bundler environment (e.g. our gems): the generated project should use it's own configuration. The problem with Bundler.with_clean_env is that, on top of restoring environment variables to their original state, it also scrubs any /BUNDLE_.*/ variables, which is harmful for authenticated gem sources. This PR replaces Bundler.with_clean_env with Bundler.with_original_env, which only restores environment variables to their initial state, without additional scrubbing.
* | | | | Revert "Merge pull request #34387 from yhirano55/rails_info_properties_json"Kasper Timm Hansen2019-01-085-37/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had a discussion on the Core team and we don't want to expose this information as a JSON endpoint and not by default. It doesn't make sense to expose this JSON locally and this controller is only accessible in dev, so the proposed access from a production app seems off. This reverts commit 8eaffe7e89719ac62ff29c2e4208cfbeb1cd1c38, reversing changes made to 133e0ba33db5887b047c9ac8233e5b414657bca5.
* | | | | Revert "Revert "Merge pull request #34387 from ↵Kasper Timm Hansen2019-01-0813-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | yhirano55/rails_info_properties_json"" I reverted the wrong commit. Damn it. This reverts commit f66a977fc7ae30d2a07124ad91924c4ee638a703.
* | | | | Revert "Merge pull request #34387 from yhirano55/rails_info_properties_json"Kasper Timm Hansen2019-01-0813-50/+0
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had a discussion on the Core team and we don't want to expose this information as a JSON endpoint and not by default. It doesn't make sense to expose this JSON locally and this controller is only accessible in dev, so the proposed access from a production app seems off. This reverts commit 8eaffe7e89719ac62ff29c2e4208cfbeb1cd1c38, reversing changes made to b6e4305c3bca4c673996d0af9db0f4cfbf50215e.
* | | | The frameworks list is order dependent.Kasper Timm Hansen2019-01-081-6/+7
| | | | | | | | | | | | | | | | Ref: https://github.com/rails/rails/commit/d507f332a955eed3d3af805a0d417fb56379a6b9
* | | | Merge pull request #34890 from rosa/test-exceptions-with-all-adaptersRafael França2019-01-084-91/+88
|\ \ \ \ | | | | | | | | | | Run exception tests for all ActiveJob adapters and fix issue with individual counters and Resque
| * | | | Ensure 0 is always the default for the individual exception counters in ↵Rosa Gutierrez2019-01-082-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveJob Some adapters like Resque that use Redis, convert the Ruby hash with a default value, Hash.new(0), into a regular hash without a default value after serializing, storing and deserializing. This raises an error when we try to access a missing exception key. A simple solution is not to rely on the hash's default value, and provide a default as alternative when accessing it instead.
| * | | | Rewrite ActiveJob exception tests so it runs with the real adaptersRosa Gutierrez2019-01-082-88/+85
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, by extending ActiveJob::TestCase, the test adapter provided for tests was being used always, in all executions where supposedly different adapters were being used. As a consequence, some bugs visible only for some adapters might have gone undetected. This commit changes that, skipping queue adapters for which we can't test scheduling jobs with a delay.
* | | | Merge pull request #34132 from ConfusedVorlon/enable_fragment_cache_log_in_devRafael França2019-01-082-0/+2
|\ \ \ \ | | | | | | | | | | enable_fragment_cache_logging in dev by default
| * | | | enable_fragment_cache_loggingRob Jonson2018-10-092-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fragment caching was refactored in (I think 5.2) and by default doesn't log cache info this is confusing in development where rails dev:cache now turns on caching, but doesn't show any different logging output better to enable debugging by default for dev - and let people turn it off if preferred
* | | | | Merge pull request #34898 from ksolo/update-raketasks-for-new-frameworksAaron Patterson2019-01-083-1/+18
|\ \ \ \ \ | | | | | | | | | | | | Add new frameworks to `tasks/release.rb`
| * | | | | add new frameworks to tasks/release.rbKevin Solorio2019-01-083-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Frameworks collection was missing actiontext and actionmailbox, this would mean they are skipped when running any tasks that iterated through this collection changes include Breaking up frameworks declaration into multiple lines and put them in order. This should make adding to the list easier and if you need to scan it, they will be in order you would expect Add `package` task to both actiontext and actionmailbox
* | | | | | Consolidate the duplicated code that building range predicateRyuta Kamizono2019-01-085-36/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This slightly change the code in the Arel to allow +/-INFINITY as open ended since the Active Record expects that behavior. See 5ecbeda.
* | | | | | Merge pull request #34896 from bannzai/fix/active_record/mysql/enum_type_mapRyuta Kamizono2019-01-082-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow space for mysql enum and set keyword.
| * | | | | | :recycle: Fix mysql type map for enum and setbannzai2019-01-082-2/+6
| | |_|/ / / | |/| | | |
* | | | | | Add load hook for ActionText::RichTextGeorge Claghorn2019-01-072-0/+3
| |/ / / / |/| | | |
* | | | | Merge pull request #34700 from gmcgibbon/fetch_multi_key_orderRafael França2019-01-073-10/+24
|\ \ \ \ \ | |/ / / / |/| | | | Preserve key order of #fetch_multi
| * | | | Preserve key order passed to ActiveSupport::CacheStore#fetch_multiGannon McGibbon2018-12-273-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fetch_multi(*names) now returns its results in the same order as the `*names` requested, rather than returning cache hits followed by cache misses.
* | | | | Merge pull request #34886 from lsylvester/attachments-for-actionmailboxGeorge Claghorn2019-01-065-1/+44
|\ \ \ \ \ | |_|_|/ / |/| | | | add attachments to the new inbound mail
| * | | | add attachments to the new inbound mailLachlan Sylvester2019-01-075-1/+44
|/ / / /
* | | | Merge pull request #34882 from bogdanvlviv/revert-129f8ac6ffGuillermo Iguaran2019-01-052-0/+9
|\ \ \ \ | | | | | | | | | | Revert "Remove node_modules path from assets load paths since we use webpack by default"
| * | | | Revert "Remove node_modules path from assets load paths since we use webpack ↵bogdanvlviv2019-01-062-0/+9
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | by default" This reverts commit 129f8ac6ffcafb2e6e13c9ef13dda4cc47f5af0d. See https://github.com/rails/rails/commit/02d2958b6cd84d687d89112eb7e2306a6a89c082#commitcomment-31849196
* | | | Reset ActionText::Content.renderer before and after each requestGeorge Claghorn2019-01-051-3/+6
| | | |
* | | | Merge pull request #34865 from cbandy/node_rails_envGeorge Claghorn2019-01-051-2/+1
|\ \ \ \ | | | | | | | | | | Respect Rails.env when running `rails yarn:install`
| * | | | Respect Rails.env when running `rails yarn:install`Chris Bandy2019-01-041-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | When no environment variables are set the expectation is that we are in development.
* | | | | Merge pull request #34878 from bogdanvlviv/action_text-guides-docsGeorge Claghorn2019-01-054-60/+122
|\ \ \ \ \ | | | | | | | | | | | | Add Action Text to guides [ci skip]
| * | | | | Add Action Text to guides [ci skip]bogdanvlviv2019-01-054-60/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move some actiontext/README.md content to Action Text Overview guide - I added WIP label to that guide since we definitely want to complement it. - Add Action Text to Major Features of Rails 6.0 Similar approach was used in #34812
* | | | | | Merge pull request #34879 from ↵George Claghorn2019-01-054-1/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | bogdanvlviv/add-skip-action-text-option-to-rails-new-cmd Add `--skip-action-text` option to `rails new`
| * | | | | | Add `--skip-action-text` option to `rails new`bogdanvlviv2019-01-054-1/+27
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Since PR#34816 was merged in c6ef670aee186a2880b7be59c4c6892b5c983e58, we should add this option for flexibility, and consistency.
* | | | | | Merge pull request #34877 from bogdanvlviv/document-action_text_content-hookGeorge Claghorn2019-01-051-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add `action_text_content` hook to the guide [ci skip]
| * | | | | | Add `action_text_content` hook to the guide [ci skip]bogdanvlviv2019-01-051-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | See actiontext/lib/action_text/content.rb:132
* | | | | | Merge pull request #34875 from bogdanvlviv/test-actiontext-on-rails-6.0George Claghorn2019-01-056-7/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Test actiontext on Rails 6.0
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 17:05:36 +0000