aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | Test actiontext on Rails 6.0bogdanvlviv2019-01-056-7/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - config.load_defaults 6.0 in the dummy app and fix the test since by default rails 6.0 configured does not generate "utf8" hidden input, see #32125 - Use `ActiveRecord::Migration[6.0]` in the dummy app since actiontext will be since Rails 6.0 - Fix `CreateActiveStorageTables` migration in the dummy app. Add `t.foreign_key :active_storage_blobs, column: :blob_id` It was added in 2ae3a29508e. - `rails/actiontext$ yarn install`
* | | | | Merge pull request #34876 from ↵George Claghorn2019-01-051-1/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bogdanvlviv/remove-needless-comment-actiontext.gemspec Remove comment from `actiontext/actiontext.gemspec`
| * | | | | Remove comment from `actiontext/actiontext.gemspec`bogdanvlviv2019-01-051-1/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This comment was autogenerated, see `railties/lib/rails/generators/rails/plugin/templates/%name%.gemspec.tt` Since actiontext is well described in this file, I think we shouldn't keep this comment. Note that this commit is more like cosmetic change, so it is OK if we don't merge this.
* | | | | Merge pull request #34874 from bogdanvlviv/fix-RichText-api-docsGeorge Claghorn2019-01-051-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix API docs of `ActionText::RichText` [ci skip]
| * | | | | Fix API docs of `ActionText::RichText` [ci skip]bogdanvlviv2019-01-051-4/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This text should appear on the page https://api.rubyonrails.org/v6.0/classes/ActionText/RichText.html Related to 86517942e469193e8624d5078d718785552c1270
* | | | | Merge pull request #34709 from gmcgibbon/action_cable_guides_es6Javan Makhmali2019-01-051-112/+160
|\ \ \ \ \ | |/ / / / |/| | | | Use ES6 and Webpacker in ActionCable guide.
| * | | | Use ES6 and Webpacker in ActionCable guide.Gannon McGibbon2019-01-041-112/+160
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Generate Action Text's API docsGeorge Claghorn2019-01-042-13/+23
| | | | |
* | | | | Label Action Text PRs [ci skip]George Claghorn2019-01-041-0/+2
| | | | |
* | | | | Merge pull request #34873 from georgeclaghorn/actiontextGeorge Claghorn2019-01-04144-5/+9447
|\ \ \ \ \ | | | | | | | | | | | | Import Action Text
| * \ \ \ \ Import Action TextGeorge Claghorn2019-01-04144-5/+9447
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Update tag helper routes for use in engines (#49)Rikki Pitt2019-01-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using the `rich_text_area_tag` form helper from within a Rails engine, the direct_upload_url and blob_url_template options would default to non-existent routes. By prefixing these routes with `main_app` we ensure the application root is used rather than the engine.
| | * | | | Fix adding a rich_text_area to a form with no modelGeorge Claghorn2018-12-315-29/+55
| | | | | |
| | * | | | Bump Nokogiri for Ruby 2.6 compatibilityGeorge Claghorn2018-12-311-4/+4
| | | | | |
| | * | | | Move method definition below callbacksGeorge Claghorn2018-12-211-5/+6
| | | | | |
| | * | | | Merge pull request #48 from lsylvester/use-plain-text-for-presenceGeorge Claghorn2018-12-202-2/+14
| | |\ \ \ \ | | | | | | | | | | | | | | use plain test to determine present/blank/empty
| | | * | | | use plain test to determine present/blank/empty as the html version will ↵Lachlan Sylvester2018-12-212-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | always contain content
| | * | | | | Fit Rails’ Ruby requirement in here.Kasper Timm Hansen2018-12-211-1/+1
| | | | | | |
| | * | | | | Merge pull request #46 from bogdanvlviv/remove-ruby-2_4-from-ciKasper Timm Hansen2018-12-211-1/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Remove Ruby 2.4 from the CI matrix
| | | * | | | | Remove Ruby 2.4 from the CI matrixbogdanvlviv2018-12-211-1/+0
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails 6 requires Ruby 2.5+ or newer. See https://github.com/rails/rails/pull/34754.
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 02:42:29 +0000