Merge branch 'master' of github.com:swagger-api/swagger-ui into bug/3102-unguarded-expressions

# Conflicts:
#	src/core/components/model.jsx
#	src/core/components/models.jsx
This commit is contained in:
Owen Conti
2017-07-03 16:12:31 -06:00
74 changed files with 811 additions and 395 deletions

View File

@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react"
import React, { Component } from "react"
import PropTypes from "prop-types"
export default class Models extends Component {
static propTypes = {
@@ -30,7 +31,6 @@ export default class Models extends Component {
<Collapse isOpened={showModels} animated>
{
definitions.entrySeq().map( ( [ name, model ])=>{
console.log("model", name, model)
return <div className="model-container" key={ `models-section-${name}` }>
<ModelWrapper name={ name }
schema={ model }