taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

Fix bad merge of the Gitlab module

Browse Source
This commit is contained in:
Chris Cummer 2018-06-13 02:36:40 -07:00
parent ab210fd040
commit 1de431d9f6
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wtf.go
View File

@ -21,15 +21,11 @@ import (
"github.com/senorprogrammer/wtf/gcal" "github.com/senorprogrammer/wtf/gcal"
"github.com/senorprogrammer/wtf/git" "github.com/senorprogrammer/wtf/git"
"github.com/senorprogrammer/wtf/github" "github.com/senorprogrammer/wtf/github"
<<<<<<< HEAD
=======
"github.com/senorprogrammer/wtf/gitlab" "github.com/senorprogrammer/wtf/gitlab"
>>>>>>> dlom-gitlab
"github.com/senorprogrammer/wtf/gspreadsheets" "github.com/senorprogrammer/wtf/gspreadsheets"
"github.com/senorprogrammer/wtf/help" "github.com/senorprogrammer/wtf/help"
"github.com/senorprogrammer/wtf/ipapi" "github.com/senorprogrammer/wtf/ipapi"
"github.com/senorprogrammer/wtf/ipinfo" "github.com/senorprogrammer/wtf/ipinfo"
"github.com/senorprogrammer/wtf/ipapi"
"github.com/senorprogrammer/wtf/jira" "github.com/senorprogrammer/wtf/jira"
"github.com/senorprogrammer/wtf/newrelic" "github.com/senorprogrammer/wtf/newrelic"
"github.com/senorprogrammer/wtf/opsgenie" "github.com/senorprogrammer/wtf/opsgenie"
@ -196,17 +192,10 @@ func addWidget(app *tview.Application, pages *tview.Pages, widgetName string) {
Widgets = append(Widgets, git.NewWidget(app, pages)) Widgets = append(Widgets, git.NewWidget(app, pages))
case "github": case "github":
Widgets = append(Widgets, github.NewWidget(app, pages)) Widgets = append(Widgets, github.NewWidget(app, pages))
<<<<<<< HEAD
case "gspreadsheets":
Widgets = append(Widgets, gspreadsheets.NewWidget())
=======
case "gitlab": case "gitlab":
Widgets = append(Widgets, gitlab.NewWidget(app, pages)) Widgets = append(Widgets, gitlab.NewWidget(app, pages))
case "gspreadsheets": case "gspreadsheets":
Widgets = append(Widgets, gspreadsheets.NewWidget()) Widgets = append(Widgets, gspreadsheets.NewWidget())
case "ipapi":
Widgets = append(Widgets, ipapi.NewWidget())
>>>>>>> dlom-gitlab
case "ipinfo": case "ipinfo":
Widgets = append(Widgets, ipinfo.NewWidget()) Widgets = append(Widgets, ipinfo.NewWidget())
case "ipapi": case "ipapi":
@ -251,15 +240,10 @@ func makeWidgets(app *tview.Application, pages *tview.Pages) {
gcal.Config = Config gcal.Config = Config
git.Config = Config git.Config = Config
github.Config = Config github.Config = Config
<<<<<<< HEAD
gspreadsheets.Config = Config
=======
gitlab.Config = Config gitlab.Config = Config
gspreadsheets.Config = Config gspreadsheets.Config = Config
ipapi.Config = Config ipapi.Config = Config
>>>>>>> dlom-gitlab
ipinfo.Config = Config ipinfo.Config = Config
ipapi.Config = Config
jira.Config = Config jira.Config = Config
newrelic.Config = Config newrelic.Config = Config
opsgenie.Config = Config opsgenie.Config = Config
@ -275,7 +259,7 @@ func makeWidgets(app *tview.Application, pages *tview.Pages) {
mods, _ := Config.Map("wtf.mods") mods, _ := Config.Map("wtf.mods")
for mod := range mods { for mod := range mods {
if enabled, _ := Config.Bool("wtf.mods." + mod + ".enabled"); enabled { if enabled := Config.UBool("wtf.mods."+mod+".enabled", false); enabled {
addWidget(app, pages, mod) addWidget(app, pages, mod)
} }