diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index e77b6785cd180d7360da178d0eca96f73b8c57d4..4e67076baed982ff9472d3dc2f5e34c389fd138c 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,48 +1,29 @@
+------
+Before filing an issue we'd appreciate it if you could take a moment to ensure
+there isn't already an open issue or pull-request.
+-----
+### Database support
+If there's an exisiting issue, please add a +1 in the comments as we
+prioritize drivers by the level of support. Otherwise, please include the name
+of the database and the version.
-### Bug Report Info
+### Feature requests and proposals
+We're excited to hear how we can make Metabase better. Please add as much detail
+as you can on your use case.
-If this is a bug report, help us diagnose your issue by checking the appropriate boxes below:
+### Bugs
+If you're filing an issue about a bug please include as much information
+as you can including the following.
-* I'm using this browser:
- - [ ] Chrome
- - [ ] Firefox
- - [ ] Safari
- - [ ] Internet Explorer / Edge
- - [ ] Other: ____________________
-* My computer's OS is:
- - [ ] OS X
- - [ ] Windows
- - [ ] Linux
- - [ ] Other: ____________________
-* I'm running Metabase:
- - [ ] Locally from the JAR
- - [ ] Locally with the Mac App
- - [ ] On AWS (via Docker)
- - [ ] On Heroku
- - [ ] Other: ____________________
-* *Internally*, Metabase is using this database: (This is the database Metabase stores internal information like accounts and dashboards in, *not* one you're running queries against. If you haven't done anything special to configure this, Metabase defaults to using H2 when running locally; if you're running Metabase on AWS or Heroku using the provided scripts/instructions, you're most likely using Postgres.):
- - [ ] H2
- - [ ] Postgres
- - [ ] MySQL
-* My data is in a database of this type:
- - [ ] Postgres
- - [ ] MySQL
- - [ ] Redshift
- - [ ] BigQuery
- - [ ] MongoDB
- - [ ] SQLite
- - [ ] Druid
- - [ ] SQL Server
- - [ ] Crate
- - [ ] Oracle
- - [ ] H2
- - [ ] Other: ____________________
-* I'm using Metabase version:
- - [ ] 0.18.0
- - [ ] 0.18.1
- - [ ] 0.19.0
- - [ ] 0.19.1
- - [ ] 0.19.2
- - [ ] 0.19.3
- - [ ] Other: ____________________
+- Your browser and the version: (e.x. Chrome 52.1, Firefox 48.0, IE 10)
+- Your operating system: (e.x. OS X 10, Windows XP, etc)
+- Your databases: (e.x. MySQL, Postgres, MongoDB, …)
+- Metabase version: (e.x. 0.19.3)
+- Metabase hosting environment: (e.x. Mac app, Elastic Beanstalk, Docker, Heroku, Linux/Ubuntu 12)
+- Metabase internal database: (e.x. H2 (default), MySQL, Postgres)
+
+- *Repeatable steps to reproduce the issue*
+
+Thanks for being part of the Metabase project!
+-------
diff --git a/bin/heroku/deploy b/bin/heroku/deploy
index 151e87e707b56c840f33ee71713eb5b9fa1f1636..f5a168d495ee83793cdd5e84afb7c324ef8db119 100755
--- a/bin/heroku/deploy
+++ b/bin/heroku/deploy
@@ -1,12 +1,49 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
set -euo pipefail
+if [ $# -gt 0 ] && [ "$1" == "-h" ]; then
+ cat <<EOM
+Usage:
+
+Deploy current branch to Heroku app "metabase-CURRENT_BRANCH_NAME"
+
+ ./bin/heroku/deploy
+
+Deploy current branch to Heroku app "HEROKU_APP_NAME"
+
+ ./bin/heroku/deploy "HEROKU_APP_NAME"
+
+Deploy "GIT_REF" (branch or tag) to Heroku app "HEROKU_APP_NAME"
+
+ ./bin/heroku/deploy "HEROKU_APP_NAME" "GIT_REF"
+
+EOM
+ exit 0
+fi
+
if [ $# -gt 0 ]; then
heroku_app_name="$1"
else
+ if [ $(git rev-parse --abbrev-ref HEAD) == "HEAD" ]; then
+ echo "Detached HEAD. Specify a Heroku app name."
+ echo ""
+ echo "For more usage examples: $0 -h"
+ exit 1
+ fi
heroku_app_name="metabase-$(git rev-parse --abbrev-ref HEAD)"
fi
+if [ $# -gt 1 ]; then
+ # "peel" annotated tags etc
+ git_local_ref="+$2^{}"
+else
+ git_local_ref="HEAD"
+fi
+
+# use explicit "master" ref in case it doesn't exist yet
+git_remote_ref="refs/heads/master"
+
if ! heroku ps -a "$heroku_app_name" > /dev/null; then
heroku apps:create -n --addons "heroku-postgresql:hobby-dev" "$heroku_app_name"
heroku buildpacks:clear -a "$heroku_app_name"
@@ -14,6 +51,7 @@ if ! heroku ps -a "$heroku_app_name" > /dev/null; then
heroku buildpacks:add "https://github.com/heroku/heroku-buildpack-clojure" -a "$heroku_app_name"
fi
-time git push -f "https://git.heroku.com/$heroku_app_name.git" HEAD:master
+echo git push -f "https://git.heroku.com/$heroku_app_name.git" "$git_local_ref:$git_remote_ref"
+time git push -f "https://git.heroku.com/$heroku_app_name.git" "$git_local_ref:$git_remote_ref"
heroku open -a "$heroku_app_name"
diff --git a/frontend/src/metabase/components/TooltipPopover.jsx b/frontend/src/metabase/components/TooltipPopover.jsx
index dea1819337d85562aae54786f808214888df68fe..5bbf6c15ab6a31bbe3602e67ed8403ffafe687cc 100644
--- a/frontend/src/metabase/components/TooltipPopover.jsx
+++ b/frontend/src/metabase/components/TooltipPopover.jsx
@@ -13,7 +13,27 @@ const wordCount = (string) => string.split(' ').length;
const TooltipPopover = ({ children, maxWidth, ...props }) => {
- const needsSpace = wordCount(children) > CONDITIONAL_WORD_COUNT
+ let popoverContent;
+
+ if (typeof children === "string") {
+ const needsSpace = wordCount(children) > CONDITIONAL_WORD_COUNT;
+ popoverContent = (
+ <div
+ className={cx(
+ { 'py1 px2': !needsSpace },
+ { 'py2 px3': needsSpace }
+ )}
+ style={{
+ maxWidth: maxWidth || "12em",
+ lineHeight: needsSpace ? 1.54 : 1
+ }}
+ >
+ {children}
+ </div>
+ );
+ } else {
+ popoverContent = children;
+ }
return (
<Popover
@@ -21,22 +41,7 @@ const TooltipPopover = ({ children, maxWidth, ...props }) => {
targetOffsetY={10}
{...props}
>
- { typeof children === "string" ?
- <div
- className={cx(
- { 'py1 px2': !needsSpace },
- { 'py2 px3': needsSpace }
- )}
- style={{
- maxWidth: maxWidth || "12em",
- lineHeight: needsSpace ? 1.54 : 1
- }}
- >
- {children}
- </div>
- :
- children
- }
+ {popoverContent}
</Popover>
)
}