diff options
| author | Phil Hughes <me@iamphill.com> | 2019-01-25 14:38:42 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-01-25 14:38:42 +0300 |
| commit | cc29bc61e0a5be0e53805665a7b3d2253f310827 (patch) | |
| tree | 01c0fab807cea5e5e38e7c596e967b3251ae8884 /package.json | |
| parent | 53b8e6e3890efdb8db132559d35ff231f2aaf71d (diff) | |
| parent | 8a03dbf8b7e6776264cef9824aba1e58dcbaef70 (diff) | |
Merge branch 'db-copy-as-gfm-prosemirror' into 'master'
Reimplement Copy-as-GFM using the prosemirror document model
See merge request gitlab-org/gitlab-ce!22797
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/package.json b/package.json index ef5c3511121..82c15f90745 100644 --- a/package.json +++ b/package.json @@ -85,6 +85,8 @@ "pikaday": "^1.6.1", "popper.js": "^1.14.3", "prismjs": "^1.6.0", + "prosemirror-markdown": "^1.3.0", + "prosemirror-model": "^1.6.4", "raphael": "^2.2.7", "raven-js": "^3.22.1", "raw-loader": "^1.0.0", @@ -101,6 +103,9 @@ "three-orbit-controls": "^82.1.0", "three-stl-loader": "^1.0.4", "timeago.js": "^3.0.2", + "tiptap": "^1.8.0", + "tiptap-commands": "^1.4.0", + "tiptap-extensions": "^1.8.0", "underscore": "^1.9.0", "url-loader": "^1.1.2", "visibilityjs": "^1.2.4", |