Fix to gitlab / wordpress custom oauth reconfiguring after settings changed

client/views/admin/admin.coffee

@@ -45,7 +45,6 @@ Template.admin.events
 	"click .submit .save": (e, t) ->
 		group = FlowRouter.getParam('group')
 		settings = Settings.find({ group: group }).fetch()
-		console.log 'will save settings', JSON.stringify settings
 		updateSettings = []
 		for setting in settings
 			value = null
@@ -59,8 +58,6 @@ Template.admin.events
 			if value?
 				updateSettings.push { _id: setting._id, value: value }
 
-		console.log 'changed settings', JSON.stringify updateSettings
-
 		if not _.isEmpty updateSettings
 			RocketChat.settings.batchSet updateSettings, (err, success) ->
 				return toastr.error TAPi18next.t 'project:Error_updating_settings' if err

packages/rocketchat-gitlab/common.coffee

@@ -7,8 +7,18 @@ config =
 
 Gitlab = new CustomOAuth 'gitlab', config
 
-Meteor.startup ->
-	Tracker.autorun ->
-		if RocketChat.settings.get 'API_Gitlab_URL'
-			config.serverURL = RocketChat.settings.get 'API_Gitlab_URL'
-			Gitlab.configure config
+if Meteor.isServer
+	Meteor.startup ->
+		RocketChat.models.Settings.find({ _id: 'API_Gitlab_URL' }).observe
+			added: (record) ->
+				config.serverURL = RocketChat.settings.get 'API_Gitlab_URL'
+				Gitlab.configure config
+			changed: (record) ->
+				config.serverURL = RocketChat.settings.get 'API_Gitlab_URL'
+				Gitlab.configure config
+else
+	Meteor.startup ->
+		Tracker.autorun ->
+			if RocketChat.settings.get 'API_Gitlab_URL'
+				config.serverURL = RocketChat.settings.get 'API_Gitlab_URL'
+				Gitlab.configure config

packages/rocketchat-wordpress/common.coffee

@@ -7,8 +7,18 @@ config =
 
 WordPress = new CustomOAuth 'wordpress', config
 
-Meteor.startup ->
-	Tracker.autorun ->
-		if RocketChat.settings.get 'API_Wordpress_URL'
-			config.serverURL = RocketChat.settings.get 'API_Wordpress_URL'
-			WordPress.configure config
+if Meteor.isServer
+	Meteor.startup ->
+		RocketChat.models.Settings.find({ _id: 'API_Wordpress_URL' }).observe
+			added: (record) ->
+				config.serverURL = RocketChat.settings.get 'API_Wordpress_URL'
+				WordPress.configure config
+			changed: (record) ->
+				config.serverURL = RocketChat.settings.get 'API_Wordpress_URL'
+				WordPress.configure config
+else
+	Meteor.startup ->
+		Tracker.autorun ->
+			if RocketChat.settings.get 'API_Wordpress_URL'
+				config.serverURL = RocketChat.settings.get 'API_Wordpress_URL'
+				WordPress.configure config