8
0
Просмотр исходного кода

Merge branch 'master' into t/152

Aleksander Nowodzinski 9 лет назад
Родитель
Сommit
daec88a624

+ 9 - 0
packages/ckeditor5-ui/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,9 @@
+### Suggested merge commit message ([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.*

+ 2 - 5
packages/ckeditor5-ui/.gitignore

@@ -1,10 +1,7 @@
 # These files will be ignored by Git and by our linting tools:
-#	grunt jshint
-#	grunt jscs
+#	gulp lint
+#	gulp lint-staged
 #
 # Be sure to append /** to folders to have everything inside them ignored.
 
-# All "dot directories".
-.*/**
-
 node_modules/**

+ 3 - 2
packages/ckeditor5-ui/lang/contexts.json

@@ -1,3 +1,4 @@
 {
-	"Rich Text Editor, %0": "Title of the CKEditor5 editor."
-}
+	"Rich Text Editor, %0": "Title of the CKEditor5 editor.",
+	"Rich Text Editor": "Title of the CKEditor5 editor."
+}

+ 1 - 1
packages/ckeditor5-ui/tests/template.js

@@ -2204,7 +2204,7 @@ describe( 'Template', () => {
 		} );
 
 		it( 'logs a warning if an element has already been rendered', () => {
-			const spy = testUtils.sinon.spy( log, 'warn' );
+			const spy = testUtils.sinon.stub( log, 'warn' );
 
 			const tpl = new Template( {
 				tag: 'p'