Merge branch 'master' of github.com:metabase/metabase into collection-position-updates

.prettierrc

frontend/src/metabase-lib/lib/metadata/Field.js

...tabase/admin/datamodel/components/revisions/QueryDiff.jsx

frontend/src/metabase/admin/permissions/selectors.js

.../metabase/admin/settings/components/SettingsBatchForm.jsx

.../metabase/admin/settings/components/SettingsEmailForm.jsx

...c/metabase/admin/settings/components/SettingsLdapForm.jsx

.../metabase/admin/settings/components/SettingsSlackForm.jsx

...n/settings/components/widgets/LdapGroupMappingsWidget.jsx

.../metabase/admin/settings/containers/SettingsEditorApp.jsx

frontend/src/metabase/admin/settings/selectors.js

frontend/src/metabase/admin/settings/settings.js

frontend/src/metabase/app.js

frontend/src/metabase/components/ButtonWithStatus.jsx

frontend/src/metabase/components/CheckBox.jsx

frontend/src/metabase/components/CollectionLanding.jsx

frontend/src/metabase/components/ErrorDetails.jsx

frontend/src/metabase/components/Grid.jsx

frontend/src/metabase/components/StackedCheckBox.jsx

frontend/src/metabase/components/TokenField.jsx