d87cc04 · obelisk · git.iko.soy

git.iko.soy/obelisk

Merge branch 'v0.5' into develop

commitd87cc0465f245754b9b848a0205e0bb2545bf68f authorElliot Cameron <eacameron@gmail.com> dateThu 6 Feb 2020, 16:54 (7 years ago) parent081054c 69a4c59

3 files changed+3−3

compare with master

unifiedsplit

ChangeLog.md+1−1 lib/command/obelisk-command.cabal+1−1 lib/command/src/Obelisk/Command/Thunk.hs+1−1

ChangeLog.md+1−1

@@ -2,7 +2,7 @@

33This project's release branch is `master`. This log is written from the perspective of the release branch: when changes hit `master`, they are considered released, and the date should reflect that release.

5−## Unreleased

5+## v0.5.0.0 - 2020-02-07

77* Add `Obelisk.Route.(?/)`, a convenience function for constructing routes nested in `Maybe`. ([#457](https://github.com/obsidiansystems/obelisk/pull/457))

88* Add local unpacked packages to the `ob run`, `ob watch`, and `ob repl` sessions. Any `.cabal` or hpack package inside the current obelisk project will be loaded into the session. For `ob run`/`ob watch` this means the session will automatically reload when you save a source file in any of those packages. For `ob repl` it means that `:r` will reload changes to any of those packages. There are some edge cases where this integration is still rough. Report any issues you encounter. ([#489](https://github.com/obsidiansystems/obelisk/pull/489))

lib/command/obelisk-command.cabal+1−1

@@ -1,5 +1,5 @@

11name: obelisk-command

2−version: 0.4

2+version: 0.5

33cabal-version: >= 1.8

44build-type: Simple

lib/command/src/Obelisk/Command/Thunk.hs+1−1

@@ -937,7 +937,7 @@ guessGitRepoIsPrivate uri = flip fix urisToTry $ \loop -> \case

937937 urisToTry = nubOrd $

938938 -- Include the original URI if it isn't using SSH because SSH will certainly fail.

939939 [uri | fmap URI.unRText (URI.uriScheme (unGitUri uri)) /= Just "ssh"] <>

940− [changeScheme "https" uri, changeScheme "http" uri, changeScheme "git" uri]

940+ [changeScheme "https" uri, changeScheme "http" uri]

941941 changeScheme scheme (GitUri u) = GitUri $ u

942942 { URI.uriScheme = URI.mkScheme scheme

943943 , URI.uriAuthority = (\x -> x { URI.authUserInfo = Nothing }) <$> URI.uriAuthority u