From 0ab72ab7bb387e48a301baba26d79a3baedb895b Mon Sep 17 00:00:00 2001 From: Jason Schweier Date: Tue, 13 Oct 2020 12:39:05 -0400 Subject: [PATCH] Default domain for gitlab (#1000) * Add a default domain for gitlab * Remove trailing whitespace --- CHANGELOG.md | 7 ++++--- modules/gitlab/settings.go | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0e79622..7a944903 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,10 +8,11 @@ * Clocks module now supports `natural` ordering option, [#896](https://github.com/wtfutil/wtf/issues/896) by [@seanstoppable](https://github.com/Seanstoppable) * Exit banner message added, by [@senorprogrammer](https://github.com/senorprogrammer) * [UptimeRobot module added](https://github.com/wtfutil/wtf/pull/983), by [@franga2000](https://github.com/franga2000) +* Gitlab module now defaults domain to `https://gitlab.com` ### 🐞 Fixed -* Exchange Rates module now displays rates in alphabetical order, sorted by the base rate, by [@senorprogrammer](https://github.com/senorprogrammer) +* Exchange Rates module now displays rates in alphabetical order, sorted by the base rate, by [@senorprogrammer](https://github.com/senorprogrammer) * Feed Reader module no longer crashes on feeds that don't have a published date, [#958](https://github.com/wtfutil/wtf/issues/958) by [@cyingfan](https://github.com/cyingfan) * Stray blank lines no longer appear at the end of highlightable lists, [#977](https://github.com/wtfutil/wtf/pull/977) by [@cyingfan](https://github.com/cyingfan) * `config.yml` now properly set to `0600` instead of `0666`, by [@cyingfan](https://github.com/cyingfan) @@ -480,7 +481,7 @@ ### ⚡️ Added -* Dependencies are now managed and installed using Go modules. See README.md for details, [#406](https://github.com/wtfutil/wtf/issues/406) by [@retgits](https://github.com/retgits) +* Dependencies are now managed and installed using Go modules. See README.md for details, [#406](https://github.com/wtfutil/wtf/issues/406) by [@retgits](https://github.com/retgits) ## 0.7.2 @@ -529,7 +530,7 @@ ### ⚡️ Added * Resource Usage module added by [@nicholas-eden](https://github.com/nicholas-eden) -* Recursive repo search in Git module ([#126](https://github.com/wtfutil/wtf/issues/126) by [@anandsudhir](http://github.com/anandsudhir)) +* Recursive repo search in Git module ([#126](https://github.com/wtfutil/wtf/issues/126) by [@anandsudhir](http://github.com/anandsudhir)) * HTTP/HTTPS handling in OpenFile() util function by [@jdenoy](https://github.com/jdenoy) * Honor system http proxies when using non-default transport by [@skymeyer](https://github.com/skymeyer) * VictorOps module added by [ImDevinC](https://github.com/ImDevinC) diff --git a/modules/gitlab/settings.go b/modules/gitlab/settings.go index 839cd1b6..dd322abf 100644 --- a/modules/gitlab/settings.go +++ b/modules/gitlab/settings.go @@ -28,7 +28,7 @@ func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *co common: cfg.NewCommonSettingsFromModule(name, defaultTitle, defaultFocusable, ymlConfig, globalConfig), apiKey: ymlConfig.UString("apiKey", ymlConfig.UString("apikey", os.Getenv("WTF_GITLAB_TOKEN"))), - domain: ymlConfig.UString("domain"), + domain: ymlConfig.UString("domain", "https://gitlab.com"), username: ymlConfig.UString("username"), }