Merge branch 'cleanups' into 'develop'

Cleanups

See merge request !54
This commit is contained in:
lambadalambda 2017-03-09 03:02:55 -05:00
commit e808df0285
2 changed files with 8 additions and 1 deletions

View file

@ -28,10 +28,17 @@ before_script:
# - node_modules/ # - node_modules/
stages: stages:
- lint
- build - build
- test - test
- deploy - deploy
lint:
stage: lint
script:
- yarn
- npm run lint
test: test:
stage: test stage: test
script: script:

View file

@ -9,7 +9,7 @@ const LoginForm = {
methods: { methods: {
submit () { submit () {
this.$store.dispatch('loginUser', this.user).then( this.$store.dispatch('loginUser', this.user).then(
() => { this.$router.push('/main/friends')}, () => {},
(error) => { (error) => {
this.authError = error this.authError = error
this.user.username = '' this.user.username = ''