diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-01-05 18:22:07 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-01-05 18:22:07 +0000 |
| commit | 2a31a850c41c53a7f00899757ffc2fa78f30e8ac (patch) | |
| tree | 520cb0b2e0326f835e539921b8b4b18c086ab87b /package.json | |
| parent | 088de7237ac20739bec189ac701510cdfa01386f (diff) | |
| parent | 3d162d192ba2a57776de62b553a2a0a9a9245f8a (diff) | |
| download | gitlab-ce-2a31a850c41c53a7f00899757ffc2fa78f30e8ac.tar.gz | |
Merge branch 'master' into 34312-eslint-vue-plugin
* master: (78 commits)
Use --left-right and --max-count for counting diverging commits
API: get participants from merge_requests & issues
Copy Mermaid graphs as GFM
Rephrase paragraph about e2e tests in merge requests in docs
Remove EE only sections from docs
Update redis-rack to 2.0.4
Refactor matchers for background migrations
Add id to modal.vue to support data-toggle="modal"
Allow local tests to use a modified Gitaly
Fix specs
Use computed prop in expand button
Update check.md
add deprecation and removal issue to docs
Add status attribute to runner api entity
Fix typos in a code comment
Refactor RelativePositioning so that it can be used by other classes
Backport 'Rebase' feature from EE to CE
Just try to detect and assign once
Fix custom name in branch creation for issue in Firefox
Modify `LDAP::Person` to return username value based on attributes
...
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json index 937f71b3d65..294c0040dd0 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,6 @@ "mousetrap": "^1.4.6", "name-all-modules-plugin": "^1.0.1", "pikaday": "^1.6.1", - "prettier": "^1.9.2", "prismjs": "^1.6.0", "raphael": "^2.2.7", "raven-js": "^3.14.0", @@ -110,6 +109,7 @@ "karma-sourcemap-loader": "^0.3.7", "karma-webpack": "^2.0.4", "nodemon": "^1.11.0", + "prettier": "1.9.2", "webpack-dev-server": "^2.6.1" } } |