Merge remote-tracking branch 'upstream/master' into add/1321-block-cl…

…asses

.gitignore

@@ -6,3 +6,4 @@ gutenberg.pot
 yarn.lock
 gutenberg.zip
 storybook-static
+.DS_Store

.storybook/config.js

@@ -17,6 +17,7 @@ function loadStories() {
 	require( './stories/intro' );
 	require( './stories/contributing' );
 	require( './stories/coding-guidelines' );
+	require( './stories/design' );
 	require( '../i18n/story' );
 	require( '../element/story' );
 	require( '../blocks/story' );

.storybook/stories/design.js

@@ -0,0 +1,15 @@
+/**
+ * External dependencies
+ */
+import ReactMarkdown from 'react-markdown';
+import { storiesOf } from '@storybook/react';
+import { withKnobs } from '@storybook/addon-knobs';
+
+/**
+ * Internal dependencies
+ */
+import readme from '../../docs/design.md';
+
+storiesOf( 'Gutenberg', module )
+	.addDecorator( withKnobs )
+	.add( 'Design', () => <ReactMarkdown source={ readme } /> );

.travis.yml

@@ -50,8 +50,22 @@ before_script:
 script:
   - |
     if [[ ! -z "$WP_VERSION" ]] ; then
+      # Run the build because otherwise there will be a bunch of warnings about
+      # failed `stat` calls from `filemtime()`.
       npm install || exit 1
       npm run build || exit 1
+      # Make sure phpegjs parser is up to date
+      node bin/create-php-parser.js || exit 1
+      if ! git diff --quiet --exit-code lib/parser.php; then
+        echo 'ERROR: The PEG parser has been updated, but the generated PHP version'
+        echo '       (lib/parser.php) has not.  Run `bin/create-php-parser.js` and'
+        echo '       commit the resulting changes to resolve this.'
+        sleep .2 # Otherwise Travis doesn't want to print the whole message
+        exit 1
+      fi
+      # Check parser syntax
+      php lib/parser.php || exit 1
+      # Run PHPUnit tests
       phpunit || exit 1
       WP_MULTISITE=1 phpunit || exit 1
     fi

CONTRIBUTORS.md

@@ -0,0 +1,70 @@
+# Contributors
+
+Gutenberg is built by many contributors and volunteers. Thanks to all of them for their work!
+
+This list is manually curated to include valuable contributions by volunteers that do not include code, such as user testing, providing feedback, or mockups. Please edit this list to include new contributors as they come in. There is no particular order to this list. If you or someone else were omitted from this list, we assure you that was not intentional. Please let us know and we'll add you.
+
+- @youknowriad
+- @aduth
+- @jasmussen
+- @iseulde
+- @mtias
+- @nylen
+- @EphoxJames
+- @mkaz
+- @notnownikki
+- @BE-Webdesign
+- @njpanderson
+- @mimo84
+- @intronic
+- @westonruter
+- @mcsf
+- @dmsnell
+- @afercia
+- @paulwilde
+- @mitogh
+- @codebykat
+- @ahmadawais
+- @kopepasah
+- @circlecube
+- @adamsilverstein
+- @timmyc
+- @ephox-mogran
+- @nb
+- @JDGrimes
+- @Soean
+- @mapk
+- @sirjonathan
+- @j-falk
+- @ryelle
+- @ntwb
+- @lamosty
+- @willybahuaud
+- @maurobringolf
+- @aaronjorbin
+- @spocke
+- @androb
+- @annaephox
+- @Afraithe
+- @georgeh
+- @m
+- @melchoyce
+- @pento
+- @karmatosed
+- @nitrajka
+- @sirreal
+- @inhil
+- @georgeolaru
+- @martinlugton
+- @joyously
+- @rileybrook
+- @azaozz
+- @folletto
+- @ianstewart
+- @johnpixle
+- @mrwweb
+- @diegoliv
+- @lukecav
+- @shaunandrews
+- @hugobaeta
+- @mizejewski