ソースを参照

Merge branch 'master' into t/397

Aleksander Nowodzinski 8 年 前
コミット
64a748df49
4 ファイル変更11 行追加15 行削除
  1. 3 8
      .github/PULL_REQUEST_TEMPLATE.md
  2. 5 5
      README.md
  3. 1 0
      lerna.json
  4. 2 2
      package.json

+ 3 - 8
.github/PULL_REQUEST_TEMPLATE.md

@@ -1,14 +1,9 @@
-### Proposed merge commit message
+### Suggested merge commit message ([convention](https://github.com/ckeditor/ckeditor5-design/wiki/Git-commit-message-convention))
 
-```
-Type: Message. Closes: #000.
-```
-
-Convention:
-https://github.com/ckeditor/ckeditor5-design/wiki/Git-commit-message-convention
+Type: Message. Closes #000.
 
 ---
 
 ### Additional information
 
-For example: encountered issues, assumptions you had to make, other affected tickets, etc.
+*For example – encountered issues, assumptions you had to make, other affected tickets, etc.*

+ 5 - 5
README.md

@@ -3,15 +3,15 @@ CKEditor 5 – development repository
 
 [![Build Status](https://travis-ci.org/ckeditor/ckeditor5.svg?branch=master)](https://travis-ci.org/ckeditor/ckeditor5)
 [![Dependency Status](https://img.shields.io/david/ckeditor/ckeditor5.svg)](https://david-dm.org/ckeditor/ckeditor5)
-[![devDependency Status](https://img.shields.io/david/ckeditor/dev/ckeditor5.svg)](https://david-dm.org/ckeditor/ckeditor5?type=dev)
+[![devDependency Status](https://img.shields.io/david/dev/ckeditor/ckeditor5.svg)](https://david-dm.org/ckeditor/ckeditor5?type=dev)
 
-## Project Status (December 2016)
+## Project Status (February 2017)
 
-Version 0.5.0 was released on November 29, 2016. This is the 5th developer preview of the new CKEditor 5.
+Version 0.7.0 was released on February 2, 2017. This is the 7th developer preview of the new CKEditor 5.
 
-Read more in the [CKEditor 5 v0.5.0 release blog post](http://ckeditor.com/blog/5th-developer-preview-of-CKEditor-5-available) and check the [CKEditor 5 sample](https://ckeditor5.github.io/).
+Read more in the [CKEditor 5 v0.7.0 release blog post](http://ckeditor.com/blog/7th-developer-preview-of-CKEditor-5-available) and check the [CKEditor 5 sample](https://ckeditor5.github.io/).
 
-**It is not production ready** and will be followed by several releases before it reaches its first stable 1.0.0 version.
+**It is not production ready** and will be followed by several releases before it reaches its first stable 1.0.0 version. See the [roadmap to 1.0.0 and beyond](https://github.com/ckeditor/ckeditor5-design/issues/172).
 
 ### Follow us!
 

+ 1 - 0
lerna.json

@@ -5,5 +5,6 @@
     "."
   ],
   "hoist": true,
+  "nohoist": "guppy-pre-commit",
   "version": "0.0.0"
 }

+ 2 - 2
package.json

@@ -31,11 +31,11 @@
   "devDependencies": {
     "@ckeditor/ckeditor5-dev-docs": "^6.1.0",
     "@ckeditor/ckeditor5-dev-lint": "^2.0.0",
-    "@ckeditor/ckeditor5-dev-tests": "^6.1.0",
+    "@ckeditor/ckeditor5-dev-tests": "^7.0.0",
     "gulp": "^3.9.0",
     "guppy-pre-commit": "^0.4.0",
     "lerna": "2.0.0-beta.36",
-    "mgit2": "^0.4.0"
+    "mgit2": "^0.5.0"
   },
   "engines": {
     "node": ">=6.0.0",