github
/
statping
mirror of https://github.com/statping/statping
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'dev' into Fix-Failure-and-Success-Templates

pull/859/head
Hunter Long 2020-12-14 13:37:14 -08:00 committed by GitHub
parent 061ed6b8bd 6ca0f22665
commit acec58f20f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/forms/Login.vue
View File

@ -110,7 +110,7 @@
return "" return ""
}, },
GHlogin() { GHlogin() {
window.location = `https://github.com/login/oauth/authorize?client_id=${this.oauth.gh_client_id}&redirect_uri=${this.encode(this.core.domain+"/oauth/github")}&scope=user,repo` window.location = `https://github.com/login/oauth/authorize?client_id=${this.oauth.gh_client_id}&redirect_uri=${this.encode(this.core.domain+"/oauth/github")}&scope=read:user,read:org`
}, },
Slacklogin() { Slacklogin() {
window.location = `https://slack.com/oauth/authorize?client_id=${this.oauth.slack_client_id}&redirect_uri=${this.encode(this.core.domain+"/oauth/slack")}&scope=identity.basic` window.location = `https://slack.com/oauth/authorize?client_id=${this.oauth.slack_client_id}&redirect_uri=${this.encode(this.core.domain+"/oauth/slack")}&scope=identity.basic`

4
handlers/cache.go
View File

@ -91,8 +91,8 @@ func (s Storage) List() map[string]Item {
//Get a cached content by key //Get a cached content by key
func (s Storage) Get(key string) []byte { func (s Storage) Get(key string) []byte {
item := s.items[key] item := s.items[key]
if s.items[key].Expired() { if item.Expired() {
CacheStorage.Delete(key) s.Delete(key)
return nil return nil
} }
return item.Content return item.Content