diff options
| author | Aaron Patterson <tenderlove@github.com> | 2019-01-11 11:21:53 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-11 11:21:53 -0800 |
| commit | 74bef0970fff60eaf5faefde30a23f3c36c0b3ee (patch) | |
| tree | 628b6013130e0d2868b2afbac3f00f24629dbb9c /actiontext/package.json | |
| parent | 1e923b498492424ae627d7a2c61339148f887503 (diff) | |
| parent | 3a1b2a21965c0cd7bcccff586ce04b029eb4c359 (diff) | |
| download | rails-74bef0970fff60eaf5faefde30a23f3c36c0b3ee.tar.gz rails-74bef0970fff60eaf5faefde30a23f3c36c0b3ee.tar.bz2 rails-74bef0970fff60eaf5faefde30a23f3c36c0b3ee.zip | |
Merge branch 'master' into ac_params_exists
Diffstat (limited to 'actiontext/package.json')
| -rw-r--r-- | actiontext/package.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actiontext/package.json b/actiontext/package.json index b42838b1df..ec8f35fd3c 100644 --- a/actiontext/package.json +++ b/actiontext/package.json @@ -1,5 +1,5 @@ { - "name": "actiontext", + "name": "@rails/actiontext", "version": "6.0.0-alpha", "description": "Edit and display rich text in Rails applications", "main": "app/javascript/actiontext/index.js", @@ -21,7 +21,7 @@ ], "license": "MIT", "dependencies": { - "trix": ">=1.0.0", - "activestorage": "6.0.0-alpha" + "trix": "^1.0.0", + "@rails/activestorage": "^6.0.0-alpha" } } |