Merge branch 'master' into webpack-migration-2.x

2017-06-29 18:23:36 -07:00
parent 34a5dc721e 20ab734edf
commit b72aa3a7c8
14 changed files with 338 additions and 58 deletions
--- a/src/core/components/operations.jsx
+++ b/src/core/components/operations.jsx
@@ -33,7 +33,7 @@ export default class Operations extends React.Component {
    const Collapse = getComponent("Collapse")

    let showSummary = layoutSelectors.showSummary()
-    let { docExpansion, displayOperationId } = getConfigs()
+    let { docExpansion, displayOperationId, displayRequestDuration } = getConfigs()

    return (
        <div>
@@ -88,6 +88,7 @@ export default class Operations extends React.Component {
                          allowTryItOut={allowTryItOut}

                          displayOperationId={displayOperationId}
+                          displayRequestDuration={displayRequestDuration}

                          specActions={ specActions }
                          specSelectors={ specSelectors }