From 08297ea83e91418293c09e265bc87ae77d867d2a Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Thu, 9 Mar 2017 08:51:33 +0100 Subject: [PATCH 1/2] Remove redirect on login This is to enable this workflow: 1. Open conversation in new tab 2. Login 3. Interact with the conversation We can add this again once we have persistent logins. --- src/components/login_form/login_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/login_form/login_form.js b/src/components/login_form/login_form.js index bc801397..1a6f6015 100644 --- a/src/components/login_form/login_form.js +++ b/src/components/login_form/login_form.js @@ -9,7 +9,7 @@ const LoginForm = { methods: { submit () { this.$store.dispatch('loginUser', this.user).then( - () => { this.$router.push('/main/friends')}, + () => {}, (error) => { this.authError = error this.user.username = '' From d954909134325ef9bf0593a05117aa2787932e59 Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Thu, 9 Mar 2017 08:58:17 +0100 Subject: [PATCH 2/2] Add linter. --- .gitlab-ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c31d2d31..296d6839 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,10 +28,17 @@ before_script: # - node_modules/ stages: + - lint - build - test - deploy +lint: + stage: lint + script: + - yarn + - npm run lint + test: stage: test script: