aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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.
| | * / / CI against Ruby 2.4.5 and 2.5.3 (#45)Tatsuya Ikeda2018-12-121-2/+2
| | |/ / | | | | | | | | Bump CI to latest minor versions of Ruby 2.4 and 2.5
| | * | Merge pull request #31 from albertoalmagro/remove-variable-shadowingGeorge Claghorn2018-10-131-8/+8
| | |\ \ | | | | | | | | | | Rename shadowed variable
| | | * | Rename shadowed variableAlberto Almagro2018-10-131-8/+8
| | | | | | | | | | | | | | | | | | | | This commit renames shadowed variable `attributes`.
| | * | | Merge pull request #30 from albertoalmagro/remove-unused-optionsGeorge Claghorn2018-10-131-3/+3
| | |\ \ \ | | | |/ / | | |/| | Remove unused **options
| | | * | Remove unused **optionsAlberto Almagro2018-10-131-3/+3
| | |/ / | | | | | | | | | | | | | | | | | | | | I'm not sure if this is going to be used in the future or not, but for the time being we shouldn't maintain parameters that we aren't using. We can always add them later when needed.
| | * | <active-text-attachment> -> <action-text-attachment>George Claghorn2018-10-121-1/+1
| | | |
| | * | APPLICATION_PATH_PATH -> APPLICATION_PACK_PATHGeorge Claghorn2018-10-121-3/+3
| | | |
| | * | Merge pull request #29 from swamp09/fix_typoJavan Makhmali2018-10-111-1/+1
| | |\ \ | | | | | | | | | | Fix typo
| | | * | Fix typoswamp092018-10-121-1/+1
| | |/ /
| | * | Merge pull request #23 from albertoalmagro/privatize-constantsJavan Makhmali2018-10-111-4/+5
| | |\ \ | | | | | | | | | | Privatize constants
| | | * | Privatize constantsAlberto Almagro2018-10-111-4/+5
| | |/ / | | | | | | | | | | | | | | | | This constants meant to be private but `private_constant` was missing, this commit makes them fully private by adding `private_constant`.
| | * | Merge pull request #27 from ↵Rafael França2018-10-101-0/+28
| | |\ \ | | | | | | | | | | | | | | | | | | | | albertoalmagro/test-coverage-form-with-rich-text-area Add test coverage for form with rich_text_area
| | | * | Add test coverage for form with rich-text-areaAlberto Almagro2018-10-101-0/+28
| | |/ /
| | * | Remove set_action_text_renderer from dummy app (#26)Liroy Leshed2018-10-101-6/+0
| | | | | | | | | | | | I don't think we need that since it's set automatically through ActionText::Engine.
| | * | Prevent rich_text_area from raising when inexistent attribute is passed (#24)Alberto Almagro Sotelo2018-10-092-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an inexistent attribute is passed as a parameter to currently existing Rails' Form Helpers they render an empty tag instead of raising an exception. This commit confers the same behavior to `rich_text_area`. Fixes #19
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 18:38:17 +0000