Merge branch 'master' of github.com:metabase/metabase into non-root-p…

…ath-v2
E1101 · Apr 13, 2017 · 9e11bad · 9e11bad
2 parents de77294 + 20ceb23
commit 9e11bad
Show file tree

Hide file tree

Showing 17 changed files with 1,465 additions and 1,431 deletions.
diff --git a/frontend/src/metabase/admin/datamodel/containers/MetricForm.jsx b/frontend/src/metabase/admin/datamodel/containers/MetricForm.jsx
@@ -40,7 +40,7 @@ import cx from "classnames";
         return errors;
     }
 },
-metricFormSelectors)
+(state, props) => metricFormSelectors(state, props))
 export default class MetricForm extends Component {
     updatePreviewSummary(datasetQuery) {
         this.props.updatePreviewSummary({

diff --git a/frontend/src/metabase/admin/datamodel/containers/SegmentForm.jsx b/frontend/src/metabase/admin/datamodel/containers/SegmentForm.jsx
@@ -38,7 +38,7 @@ import cx from "classnames";
     },
     initialValues: { name: "", description: "", table_id: null, definition: { filter: [] }, revision_message: null }
 },
-segmentFormSelectors)
+(state, props) => segmentFormSelectors(state, props))
 export default class SegmentForm extends Component {
     updatePreviewSummary(datasetQuery) {
         this.props.updatePreviewSummary({

diff --git a/frontend/src/metabase/auth/components/SSOLoginButton.jsx b/frontend/src/metabase/auth/components/SSOLoginButton.jsx
@@ -1,7 +1,7 @@
 import React, { Component } from "react";
 import PropTypes from "prop-types";
 import Icon from "metabase/components/Icon";
-import { capitalize } from 'humanize'
+import { capitalize } from "humanize-plus"
 
 const propTypes = {
   provider: PropTypes.string.isRequired

diff --git a/frontend/src/metabase/components/__snapshots__/Button.spec.js.snap b/frontend/src/metabase/components/__snapshots__/Button.spec.js.snap
@@ -1,8 +1,12 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
 exports[`Button should render correctly 1`] = `
 <button
-  className="Button ">
+  className="Button "
+>
   <div
-    className="flex layout-centered">
+    className="flex layout-centered"
+  >
     <div>
       Clickity click
     </div>
@@ -12,19 +16,23 @@ exports[`Button should render correctly 1`] = `
 
 exports[`Button should render correctly with an icon 1`] = `
 <button
-  className="Button ">
+  className="Button "
+>
   <div
-    className="flex layout-centered">
+    className="flex layout-centered"
+  >
     <svg
       className="mr1"
       fill="currentcolor"
       height={14}
       name="star"
       size={14}
       viewBox="0 0 32 32"
-      width={14}>
+      width={14}
+    >
       <path
-        d="M16 0 L21 11 L32 12 L23 19 L26 31 L16 25 L6 31 L9 19 L0 12 L11 11" />
+        d="M16 0 L21 11 L32 12 L23 19 L26 31 L16 25 L6 31 L9 19 L0 12 L11 11"
+      />
     </svg>
     <div>
       Clickity click

diff --git a/frontend/src/metabase/css/core/text.css b/frontend/src/metabase/css/core/text.css
@@ -129,6 +129,10 @@
     font-family: Monaco, monospace;
 }
 
+.text-pre-wrap {
+  white-space: pre-wrap;
+}
+
 .text-measure {
     max-width: 620px;
 }