diff options
| author | lambadalambda <gitgud@rogerbraun.net> | 2017-03-09 03:02:55 -0500 |
|---|---|---|
| committer | lambadalambda <gitgud@rogerbraun.net> | 2017-03-09 03:02:55 -0500 |
| commit | e808df0285c8d8d6184f2933f8f6d07395039c10 (patch) | |
| tree | 839ffda8cc34dc5577c0bcb047fe57e5eaf6551c | |
| parent | 2a29c896724698cb9ac35f8d1b4b581e4f49eec6 (diff) | |
| parent | d954909134325ef9bf0593a05117aa2787932e59 (diff) | |
Merge branch 'cleanups' into 'develop'
Cleanups
See merge request !54
| -rw-r--r-- | .gitlab-ci.yml | 7 | ||||
| -rw-r--r-- | src/components/login_form/login_form.js | 2 |
2 files changed, 8 insertions, 1 deletions
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: 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 = '' |