From 7259b1d7eb281468c8f490ab66e501c94a53234d Mon Sep 17 00:00:00 2001 From: Aaron Friel Date: Thu, 10 Aug 2017 07:40:27 +0000 Subject: [PATCH 1/8] Add .gitlab-ci.yml --- .gitlab-ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..ade842c --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,9 @@ +image: registry.gitlab.frielforreal.com/friel/haskellstack:latest + +stages: + - build + +build: + stage: build + script: + - stack build From 854abcaf98825b8c248b4504a39b17e6c76f9e90 Mon Sep 17 00:00:00 2001 From: Aaron Friel Date: Thu, 10 Aug 2017 07:56:33 +0000 Subject: [PATCH 2/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ade842c..11c5cc8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,9 @@ image: registry.gitlab.frielforreal.com/friel/haskellstack:latest +cache: + paths: + - .stack-work + stages: - build From 98f1f9ad23c460cec7e0fb8641ad175316512eb5 Mon Sep 17 00:00:00 2001 From: Aaron Friel Date: Thu, 10 Aug 2017 15:48:06 +0000 Subject: [PATCH 3/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 11c5cc8..9c1f957 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,10 +1,10 @@ image: registry.gitlab.frielforreal.com/friel/haskellstack:latest cache: - paths: - - .stack-work - + untracked: true + stages: + key: "$CI_COMMIT_REF_NAME" - build build: From 4434257f6846a384abc14a28f01af91a4bd6f600 Mon Sep 17 00:00:00 2001 From: Aaron Friel Date: Thu, 10 Aug 2017 15:48:16 +0000 Subject: [PATCH 4/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9c1f957..e0c4bd6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,6 @@ cache: untracked: true stages: - key: "$CI_COMMIT_REF_NAME" - build build: From 122889260470dfe80cbd88b5a0f86f3717a6b5c1 Mon Sep 17 00:00:00 2001 From: Aaron Friel Date: Thu, 10 Aug 2017 16:54:42 +0000 Subject: [PATCH 5/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e0c4bd6..65d7100 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,4 +9,5 @@ stages: build: stage: build script: + - ls -laR . - stack build From 3f7ae943986c252a601f442a43edc3c80211e313 Mon Sep 17 00:00:00 2001 From: Aaron Friel Date: Thu, 10 Aug 2017 17:20:56 +0000 Subject: [PATCH 6/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 65d7100..541c443 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,3 +11,5 @@ build: script: - ls -laR . - stack build + - ls -laR . + - git ls-files --others --exclude-standard \ No newline at end of file From 0aee35e67f45e83e14cff1b0a07380da9dd66ebc Mon Sep 17 00:00:00 2001 From: Aaron Friel Date: Thu, 10 Aug 2017 20:14:47 +0000 Subject: [PATCH 7/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 541c443..62581bf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,8 @@ image: registry.gitlab.frielforreal.com/friel/haskellstack:latest cache: untracked: true + paths: + - .stack-work stages: - build @@ -9,7 +11,4 @@ stages: build: stage: build script: - - ls -laR . - - stack build - - ls -laR . - - git ls-files --others --exclude-standard \ No newline at end of file + - stack build \ No newline at end of file From fba73d65316f752cc440cb304df93a8998b1e529 Mon Sep 17 00:00:00 2001 From: vrom911 Date: Sat, 12 Aug 2017 18:09:17 +0300 Subject: [PATCH 8/8] Fix auth page --- src/Guide/Main.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Guide/Main.hs b/src/Guide/Main.hs index eaea2ff..0371f3b 100644 --- a/src/Guide/Main.hs +++ b/src/Guide/Main.hs @@ -321,9 +321,9 @@ guideApp waiMetrics = do if isJust user then Spock.redirect "auth/logout" else Spock.redirect "auth/login" - Spock.getpost "login" $ authRedirect "/" loginAction - Spock.get "logout" logoutAction - Spock.getpost "register" $ authRedirect "/" signupAction + Spock.getpost (authRoute "login") $ authRedirect "/" loginAction + Spock.get (authRoute "logout") logoutAction + Spock.getpost (authRoute "register") $ authRedirect "/" signupAction loginAction :: GuideAction ctx () loginAction = do