summaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-08-07 15:20:09 -0500
committerMike Greiling <mike@pixelcog.com>2017-08-07 15:20:09 -0500
commit7767ceef47a57baf2bc03f609e3dbf77ed44c9aa (patch)
tree0d057168bfba56bff88f2bf1b4e8f19af0aa2204 /package.json
parent1d5a306596e56398c3f6f46feafd1f4ce23c3c2c (diff)
parentb12107a0b953b566cd58db30ae880800a4a695a6 (diff)
downloadgitlab-ce-7767ceef47a57baf2bc03f609e3dbf77ed44c9aa.tar.gz
Merge branch 'master' into ide
* master: (177 commits) Add changelog Bump gitlab-shell version to 5.8.0 to fix Git for Windows 2.14 Make contextual sidebar collapsible Fixed sidebar context header hover colors Use correct `Environment`-class within `Gitlab` namespace Remove gl.Activities from Commits page Move `let` calls inside the `describe` block using them Add `/assign me` alias support for assigning issuables to oneself GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandError Use `broken_storage` in the fs_shards_spec. Eager load project creators for project dashboards Memoize a user's personal projects count Remove redundant query from User#recent_push Improve checking if projects would be returned Change spelling of gitlab-shell Remove unused #tree-holder Add custom linter for inline JavaScript to haml_lint Rename user_can_admin? because it's more accurate Synchronous zanata community contribution translation Add Korean translation to i18n ...
Diffstat (limited to 'package.json')
-rw-r--r--package.json1
1 files changed, 0 insertions, 1 deletions
diff --git a/package.json b/package.json
index ee489213865..2355aad79cc 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,6 @@
"monaco-editor": "0.8.3",
"mousetrap": "^1.4.6",
"name-all-modules-plugin": "^1.0.1",
- "pdfjs-dist": "^1.8.252",
"pikaday": "^1.5.1",
"prismjs": "^1.6.0",
"raphael": "^2.2.7",