pleroma-fe

commit: e808df0285c8d8d6184f2933f8f6d07395039c10
parent: 2a29c896724698cb9ac35f8d1b4b581e4f49eec6
Author: lambadalambda <gitgud@rogerbraun.net>
Date:   Thu,  9 Mar 2017 03:02:55 -0500

Merge branch 'cleanups' into 'develop'

Cleanups

See merge request !54
Diffstat:
M
.gitlab-ci.yml
7
+++++++
M
src/components/login_form/login_form.js
2
+-

2 files changed, 8 insertions(+), 1 deletion(-)
diff --git 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
@@ -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 = ''