Skip to content

Commit

Permalink
Merge pull request TryGhost#6663 from kevinansfield/fix-xregexp-issues
Browse files Browse the repository at this point in the history
Drop XRegExp dependency
  • Loading branch information
jaswilli committed Mar 31, 2016
2 parents adaf15d + ed1d6c9 commit 23d630b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
7 changes: 5 additions & 2 deletions ghost/admin/app/utils/word-count.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions ghost/admin/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"rangyinputs": "1.2.0",
"selectize": "~0.12.1",
"showdown-ghost": "0.3.6",
"validator-js": "3.39.0",
"xregexp": "2.0.0"
"validator-js": "3.39.0"
}
}
1 change: 0 additions & 1 deletion ghost/admin/ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ module.exports = function (defaults) {
app.import('bower_components/codemirror/mode/xml/xml.js');
app.import('bower_components/codemirror/mode/css/css.js');
app.import('bower_components/codemirror/mode/javascript/javascript.js');
app.import('bower_components/xregexp/xregexp-all.js');
app.import('bower_components/password-generator/lib/password-generator.js');
app.import('bower_components/blueimp-md5/js/md5.js');

Expand Down

0 comments on commit 23d630b

Please sign in to comment.