git.iko.soy/obelisk
on master help sign in
Merge branch 'develop' into ts-fix-underflow
commitf29a809b7f9f630844dd281de79189487ca268a3 authorAli Abrar <aliabrar@gmail.com> dateWed 14 Aug 2019, 16:50 (7 years ago) parent69cfb45c8d2128
4 files changed+8−2
compare with master
unifiedsplit
CONTRIBUTING.md+5 ChangeLog.md+1 default.nix+1−1 lib/route/src/Obelisk/Route.hs+1−1
CONTRIBUTING.md+5
@@ -5,6 +5,7 @@ Contributions and issue reports are encouraged and appreciated!
55- [Opening Issues](#opening-issues)
66- [Submitting Changes](#submitting-changes)
77 - [Guidelines for Commit Messages](#guidelines-for-commit-messages)
8+ - [Guidelines for Pull Requests](#guidelines-for-pull-requests)
89 - [Code Quality](#code-quality)
910 - [Documentation](#documentation)
1011
@@ -34,6 +35,10 @@ Commits that update a dependency should include some information about why the d
3435#### Body
3536For breaking changes, new features, refactors, or other major changes, the body of the commit message should describe the motivation behind the change in greater detail and may include references to the issue tracker. The body shouldn't repeat code/comments from the diff.
3637
38+### Guidelines for Pull Requests
39+
40+Wherever possible, pull requests should add a single feature or fix a single bug. Pull requests should not bundle several unrelated changes.
41+
3742### Code Quality
3843
3944#### Warnings
ChangeLog.md+1
@@ -9,6 +9,7 @@ This project's release branch is `master`. This log is written from the perspect
99* The backend no longer runs in BackendConfigsT.
1010* Add tabulation package. See Data.Tabulation for details.
1111* Add encoders for `DMap`, `HasFields` (cf. Data.Tabulation), and JSON.
12+* Use IP address for nginx proxy pass instead of localhost
1213
1314## v0.1.1.0 - 2019-05-17
1415
default.nix+1−1
@@ -198,7 +198,7 @@ in rec {
198198 enableACME = enableHttps;
199199 forceSSL = enableHttps;
200200 locations.${baseUrl} = {
201− proxyPass = "http://localhost:" + toString internalPort;
201+ proxyPass = "http://127.0.0.1:" + toString internalPort;
202202 proxyWebsockets = true;
203203 };
204204 };
lib/route/src/Obelisk/Route.hs+1−1
@@ -202,7 +202,7 @@ decode e x = runIdentity (tryDecode e x)
202202tryDecode :: Encoder Identity parse decoded encoded -> encoded -> parse decoded
203203tryDecode (Encoder (Identity impl)) x = _encoderImpl_decode impl x
204204
205−-- | Similar to 'decode' above, once an encoder has been checked so that its check monad is Identity, it
205+-- | Similar to 'decode', once an encoder has been checked so that its check monad is Identity, it
206206-- can be used to actually encode by using this. Note that while there's no constraint on the parse monad here,
207207-- one should usually be applying decode and encode to the same 'Encoder'
208208encode :: Encoder Identity parse decoded encoded -> decoded -> encoded