New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Import Action Text #34873

Merged
merged 148 commits into from Jan 5, 2019

Conversation

Projects
None yet
@georgeclaghorn
Copy link
Member

georgeclaghorn commented Jan 5, 2019

No description provided.

sstephenson and others added some commits Feb 7, 2018

Use rich_text instead of active_text
Just like we use has_many_attachments instead of active_storage_attachements.
Rename from Active Text to Action Text
This is more like Action View than Active Model.

javan and others added some commits Oct 11, 2018

Remove unused **options
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.
Rename shadowed variable
This commit renames shadowed variable `attributes`.
CI against Ruby 2.4.5 and 2.5.3 (#45)
Bump CI to latest minor versions of Ruby 2.4 and 2.5
Remove Ruby 2.4 from the CI matrix
Rails 6 requires Ruby 2.5+ or newer.
See #34754.
Merge pull request #46 from bogdanvlviv/remove-ruby-2_4-from-ci
Remove Ruby 2.4 from the CI matrix
Merge pull request #48 from lsylvester/use-plain-text-for-presence
use plain test to determine present/blank/empty
Update tag helper routes for use in engines (#49)
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.

@georgeclaghorn georgeclaghorn force-pushed the georgeclaghorn:actiontext branch 4 times, most recently from a032555 to 792e4c7 Jan 5, 2019

@georgeclaghorn georgeclaghorn force-pushed the georgeclaghorn:actiontext branch from 792e4c7 to 0decd2d Jan 5, 2019

@georgeclaghorn georgeclaghorn merged commit df8ee09 into rails:master Jan 5, 2019

2 checks passed

codeclimate All good!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@georgeclaghorn georgeclaghorn deleted the georgeclaghorn:actiontext branch Jan 5, 2019

require "rubygems"
require "bundler/setup"

load Gem.bin_path("webpacker", "webpack")

This comment has been minimized.

@bogdanvlviv

bogdanvlviv Jan 5, 2019

Contributor

@javan Do we need this and actiontext/bin/webpack-dev-server files because I see they aren't working now on the rails/rails' master branch?

@@ -9,6 +9,7 @@ AllCops:
- 'actionpack/lib/action_dispatch/journey/parser.rb'
- 'railties/test/fixtures/tmp/**/*'
- 'actionmailbox/test/dummy/**/*'
- 'actiontext/test/dummy/**/*'

This comment has been minimized.

@rafaelfranca

rafaelfranca Jan 7, 2019

Member

I don't think this put a dummy application inside the framework tests scale in the rails repository. It does make sense for an external plugin but for things that are inside the rails repository we should be following the same railties tests pattern that we have for all the other frameworks. The dummy application get outdated and we will end up testing those engines against a version behind of the one that is being currently being developed.

bogdanvlviv added a commit to bogdanvlviv/rails that referenced this pull request Jan 13, 2019

Add mention to the main README about new libraries [ci skip]
Action Mailbox and Action Text belong to rails/rails since rails#34786 and rails#34873.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment