Merge branch 'develop' into globals/tests

RocketChat · Dec 17, 2018 · 1411d36 · 1411d36
2 parents f06a5f7 + d1b6211
commit 1411d36
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 2 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -20,11 +20,9 @@
 		"RocketChat"                  : true,
 		"RoomHistoryManager"          : false,
 		"RoomManager"                 : false,
-		"ServiceConfiguration"        : false,
 		"Settings"                    : false,
 		"SideNav"                     : false,
 		"t"                           : false,
-		"toastr"                      : false,
 		"VideoRecorder"               : false,
 		"VRecDialog"                  : false
 	}

diff --git a/packages/rocketchat-custom-oauth/client/custom_oauth_client.js b/packages/rocketchat-custom-oauth/client/custom_oauth_client.js
@@ -3,6 +3,7 @@ import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
 import { Accounts } from 'meteor/accounts-base';
 import { Random } from 'meteor/random';
+import { ServiceConfiguration } from 'meteor/service-configuration';
 import s from 'underscore.string';
 
 // Request custom OAuth credentials for the user

diff --git a/packages/rocketchat-custom-oauth/server/custom_oauth_server.js b/packages/rocketchat-custom-oauth/server/custom_oauth_server.js
@@ -3,6 +3,7 @@ import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
 import { Accounts } from 'meteor/accounts-base';
 import { HTTP } from 'meteor/http';
+import { ServiceConfiguration } from 'meteor/service-configuration';
 import _ from 'underscore';
 
 const logger = new Logger('CustomOAuth');

diff --git a/packages/rocketchat-lib/server/methods/refreshOAuthService.js b/packages/rocketchat-lib/server/methods/refreshOAuthService.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { ServiceConfiguration } from 'meteor/service-configuration';
 
 Meteor.methods({
 	refreshOAuthService() {

diff --git a/packages/rocketchat-lib/server/oauth/oauth.js b/packages/rocketchat-lib/server/oauth/oauth.js
@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 import { Accounts } from 'meteor/accounts-base';
+import { ServiceConfiguration } from 'meteor/service-configuration';
 import _ from 'underscore';
 
 const AccessTokenServices = {};

diff --git a/packages/rocketchat-lib/server/startup/oAuthServicesUpdate.js b/packages/rocketchat-lib/server/startup/oAuthServicesUpdate.js
@@ -1,5 +1,6 @@
 /* globals CustomOAuth */
 import { Meteor } from 'meteor/meteor';
+import { ServiceConfiguration } from 'meteor/service-configuration';
 import _ from 'underscore';
 
 const logger = new Logger('rocketchat:lib', {

diff --git a/packages/rocketchat-ui/client/lib/iframeCommands.js b/packages/rocketchat-ui/client/lib/iframeCommands.js
@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
+import { ServiceConfiguration } from 'meteor/service-configuration';
 import s from 'underscore.string';
 
 const commands = {

diff --git a/server/startup/migrations/v018.js b/server/startup/migrations/v018.js
@@ -1,3 +1,5 @@
+import { ServiceConfiguration } from 'meteor/service-configuration';
+
 RocketChat.Migrations.add({
 	version: 18,
 	up() {

diff --git a/server/startup/migrations/v075.js b/server/startup/migrations/v075.js
@@ -1,3 +1,5 @@
+import { ServiceConfiguration } from 'meteor/service-configuration';
+
 RocketChat.Migrations.add({
 	version: 71.1,
 	up() {