rebase to master + resolve some conflicts

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
This commit is contained in:
Miska Kaipiainen authored and Jari Kolehmainen committed 2020-04-10 10:47:25 +03:00
1 parent 8b3acf2ded
commit dc3e3d90cc
32 files changed
+47 -47

No files matched your search

@@ -38,8 +38,8 @@ export class ErrorBoundary extends React.Component<Props, State> {
render() {
const { error, errorInfo } = this.state;
if (error) {
const slackLink = <a href="https://slack.kontena.io" target="_blank">Kontena Slack</a>
const githubLink = <a href="https://github.com/kontena/lens/issues" target="_blank">Kontena Github</a>
const slackLink = <a href="https://join.slack.com/t/kontenacommunity/shared_invite/enQtOTc5NjAyNjYyOTk4LWU1NDQ0ZGFkOWJkNTRhYTc2YjVmZDdkM2FkNGM5MjhiYTRhMDU2NDQ1MzIyMDA4ZGZlNmExOTc0N2JmY2M3ZGI" target="_blank">Slack</a>
const githubLink = <a href="https://github.com/lensapp/lens/issues" target="_blank">Github</a>
const pageUrl = location.href;
return (
<div className="ErrorBoundary flex column gaps">