Merge branch 'master' into 142993479-tags

This commit is contained in:
Wyatt Johnson
2017-05-17 10:01:58 -06:00
150 changed files with 1038 additions and 1105 deletions
+1 -1
View File
@@ -24,7 +24,7 @@ describe('graph.loaders.Metrics', () => {
describe('different comment states', () => {
beforeEach(() =>[
CommentModel.create( {id: '1', body: 'a new comment!'}),
CommentModel.create({id: '1', body: 'a new comment!'}),
CommentModel.create({id: '2', body: 'a new comment!'}),
CommentModel.create({id: '3', body: 'a new comment!'})
]);