From 8b6181c31a96a5e83eb390a37d70bd3b6cbb21d9 Mon Sep 17 00:00:00 2001 From: Britney Wright Date: Fri, 13 Jul 2018 12:29:45 -0400 Subject: [PATCH 1/2] gitSiteURL supports MicrositeKeys.GitHub and gitHostingUrl --- src/main/scala/microsites/microsites.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/microsites/microsites.scala b/src/main/scala/microsites/microsites.scala index 247744e3..acc59286 100644 --- a/src/main/scala/microsites/microsites.scala +++ b/src/main/scala/microsites/microsites.scala @@ -91,8 +91,8 @@ case class MicrositeSettings( micrositeKazariSettings: KazariSettings) { def gitSiteUrl: String = { - gitSettings.gitHostingService match { - case MicrositeKeys.GitHub => + (gitSettings.gitHostingService, gitSettings.gitHostingUrl) match { + case (MicrositeKeys.GitHub, "") => s"https://github.com/${gitSettings.githubOwner}/${gitSettings.githubRepo}" case _ => gitSettings.gitHostingUrl } From d8ce68e275ff4fe80fdfbf8935ad77d981618ca2 Mon Sep 17 00:00:00 2001 From: Britney Wright Date: Sun, 15 Jul 2018 11:30:50 -0400 Subject: [PATCH 2/2] update docs for micrositeGitHostingUrl --- docs/src/main/tut/docs/settings.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/main/tut/docs/settings.md b/docs/src/main/tut/docs/settings.md index f35195d1..c83e06bf 100644 --- a/docs/src/main/tut/docs/settings.md +++ b/docs/src/main/tut/docs/settings.md @@ -110,7 +110,7 @@ micrositeGithubToken := getEnvVar("GITHUB_TOKEN") micrositePushSiteWith := GitHub4s ``` -- `micrositeGitHostingService` and `micrositeGitHostingUrl`: in order to specify a hosting service other than `GitHub`: +- `micrositeGitHostingService` and `micrositeGitHostingUrl`: in order to specify a hosting service other than `GitHub`. If you are using a privately hosted GitHub instance you can set the `micrositeGitHostingUrl` to override the default github.com and repo name configuration. ``` micrositeGitHostingService := GitLab