From 597639c09662b5f43ff966938c5e55e485a1563c Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <git@zjvandeweg.nl>
Date: Mon, 6 Mar 2017 14:06:33 +0100
Subject: [PATCH] Fix eslint
---
.../behaviors/{bind_in_out.js.es6 => bind_in_out.js} | 0
app/assets/javascripts/dispatcher.js | 2 +-
app/services/groups/create_service.rb | 9 +++------
.../{bind_in_out_spec.js.es6 => bind_in_out_spec.js} | 4 ++--
4 files changed, 6 insertions(+), 9 deletions(-)
rename app/assets/javascripts/behaviors/{bind_in_out.js.es6 => bind_in_out.js} (100%)
rename spec/javascripts/behaviors/{bind_in_out_spec.js.es6 => bind_in_out_spec.js} (97%)
diff --git a/app/assets/javascripts/behaviors/bind_in_out.js.es6 b/app/assets/javascripts/behaviors/bind_in_out.js
similarity index 100%
rename from app/assets/javascripts/behaviors/bind_in_out.js.es6
rename to app/assets/javascripts/behaviors/bind_in_out.js
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
index 1fe8c937f27..31f10f89245 100644
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -35,7 +35,7 @@
/* global Labels */
/* global Shortcuts */
-import BindInOut from './behaviors/bind_in_out.js.es6';
+import BindInOut from './behaviors/bind_in_out';
import GroupsList from './groups_list';
import ProjectsList from './projects_list';
diff --git a/app/services/groups/create_service.rb b/app/services/groups/create_service.rb
index 6ef78c3e677..c4e9b8fd8e0 100644
--- a/app/services/groups/create_service.rb
+++ b/app/services/groups/create_service.rb
@@ -23,13 +23,10 @@ module Groups
@group.name ||= @group.path.dup
if create_chat_team?
- begin
- response = Mattermost::CreateTeamService.new(@group, current_user).execute
-
- @group.build_chat_team(name: response['name'], team_id: response['id'])
- end
-
+ response = Mattermost::CreateTeamService.new(@group, current_user).execute
return @group if @group.errors.any?
+
+ @group.build_chat_team(name: response['name'], team_id: response['id'])
end
@group.save
diff --git a/spec/javascripts/behaviors/bind_in_out_spec.js.es6 b/spec/javascripts/behaviors/bind_in_out_spec.js
similarity index 97%
rename from spec/javascripts/behaviors/bind_in_out_spec.js.es6
rename to spec/javascripts/behaviors/bind_in_out_spec.js
index 4f889c58bcd..dd9ab33289f 100644
--- a/spec/javascripts/behaviors/bind_in_out_spec.js.es6
+++ b/spec/javascripts/behaviors/bind_in_out_spec.js
@@ -1,5 +1,5 @@
-import BindInOut from '~/behaviors/bind_in_out.js.es6';
-import ClassSpecHelper from '../helpers/class_spec_helper.js.es6';
+import BindInOut from '~/behaviors/bind_in_out';
+import ClassSpecHelper from '../helpers/class_spec_helper';
describe('BindInOut', function () {
describe('.constructor', function () {
--
GitLab