Merge branch 'master' into update_dep_2

amanda11 · web-flow · commit aa9a8280bfd6 · 2021-12-09T18:22:12.000Z
diff --git a/modules/st2-login/login.component.js b/modules/st2-login/login.component.js
@@ -164,7 +164,7 @@ export default class Login extends React.Component {
   }
 
   docsLink = 'https://docs.stackstorm.com/'
-  supportLink = 'https://forum.stackstorm.com/'
+  supportLink = 'https://github.com/StackStorm/st2/discussions'
 
   connect(e) {
     e.preventDefault();
diff --git a/modules/st2-menu/menu.component.js b/modules/st2-menu/menu.component.js
@@ -75,7 +75,7 @@ export default class Menu extends React.Component {
   }
 
   docsLink = 'https://docs.stackstorm.com/'
-  supportLink = 'https://forum.stackstorm.com/'
+  supportLink = 'https://github.com/StackStorm/st2/discussions'
 
   idleLogout() {
     let t;

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ export default class Login extends React.Component {`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`docsLink = 'https://docs.stackstorm.com/'`
`167`		`- supportLink = 'https://forum.stackstorm.com/'`
	`167`	`+ supportLink = 'https://github.com/StackStorm/st2/discussions'`
`168`	`168`
`169`	`169`	`connect(e) {`
`170`	`170`	`e.preventDefault();`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ export default class Menu extends React.Component {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`docsLink = 'https://docs.stackstorm.com/'`
`78`		`- supportLink = 'https://forum.stackstorm.com/'`
	`78`	`+ supportLink = 'https://github.com/StackStorm/st2/discussions'`
`79`	`79`
`80`	`80`	`idleLogout() {`
`81`	`81`	`let t;`