Skip to content
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
Merged

Import Action Text #34873

merged 148 commits into from Jan 5, 2019

Conversation

@georgeclaghorn
Copy link
Contributor

@georgeclaghorn georgeclaghorn commented Jan 5, 2019

No description provided.

sstephenson and others added 30 commits Feb 7, 2018
albertoalmagro and others added 23 commits Oct 10, 2018
…ch-text-area

Add test coverage for form with rich_text_area
This constants meant to be private but `private_constant` was missing,
this commit makes them fully private by adding  `private_constant`.
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.
This commit renames shadowed variable `attributes`.
Bump CI to latest minor versions of Ruby 2.4 and 2.5
Rails 6 requires Ruby 2.5+ or newer.
See #34754.
use plain test to determine present/blank/empty
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 merged commit df8ee09 into rails:master Jan 5, 2019
2 checks passed
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
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
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet