Skip to content
Snippets Groups Projects
Commit a876156c authored by Allen Gilliland's avatar Allen Gilliland
Browse files

Merge pull request #2185 from metabase/report-timezone-warning

Report Timezone setting warning
parents 50853ceb 9466d8c7
No related branches found
No related tags found
No related merge requests found
......@@ -81,7 +81,10 @@ export default class SettingsSetting extends Component {
return (
<li className="m2 mb4">
<div className="text-grey-4 text-bold text-uppercase">{setting.display_name}</div>
<div className="text-grey-4 my1">{setting.description}</div>
<div className="text-grey-4 my1">
{setting.description}
{setting.note && <div>{setting.note}</div>}
</div>
<div className="flex">{control}</div>
</li>
);
......
......@@ -33,7 +33,8 @@ const SECTIONS = [
{ name: "Database Default", value: "" },
...MetabaseSettings.get('timezones')
],
placeholder: "Select a timezone"
placeholder: "Select a timezone",
note: "Not all databases support timezones, in which case this setting won't take effect."
},
{
key: "anon-tracking-enabled",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment