Organize Gitlab settings

.jshintrc

@@ -83,6 +83,7 @@
     "globals"       : {
         "Promise"    : true,      // Avoid "redefinition of Promise" warning
         "Meteor"     : true,
+        "Package"    : true,
         "Session"    : true,
         "RocketChat" : true,
         "Npm"        : true,

packages/rocketchat-github-enterprise/i18n/ar.i18n.json

 {
-  "Github_Enterprise_Url_No_Trail" : "مثال: http://domain.com (بدون الشرطة المائلة في الأخير)"
-}
\ No newline at end of file
+  "API_GitHub_Enterprise_URL_Description" : "مثال: http://domain.com (بدون الشرطة المائلة في الأخير)"
+}

packages/rocketchat-github-enterprise/i18n/de.i18n.json

@@ -3,5 +3,5 @@
   "API_GitHub_Enterprise_URL" : "Server-URL",
   "Accounts_OAuth_GitHub_Enterprise_id" : "Client-ID",
   "Accounts_OAuth_GitHub_Enterprise_secret" : "Client-Secret",
-  "Github_Enterprise_Url_No_Trail" : "Beispiel: http://domain.com (ohne Schrägstrich am Ende)"
-}
\ No newline at end of file
+  "API_GitHub_Enterprise_URL_Description" : "Beispiel: http://domain.com (ohne Schrägstrich am Ende)"
+}

packages/rocketchat-github-enterprise/i18n/en.i18n.json

@@ -4,5 +4,5 @@
   "Accounts_OAuth_GitHub_Enterprise_id" : "Client Id",
   "Accounts_OAuth_GitHub_Enterprise_secret" : "Client Secret",
   "Accounts_OAuth_GitHub_Enterprise_callback_url" : "Github Enterprise Callback URL",
-  "Github_Enterprise_Url_No_Trail" : "Example: http://domain.com (excluding trailing slash)"
-}
\ No newline at end of file
+  "API_GitHub_Enterprise_URL_Description" : "Example: http://domain.com (excluding trailing slash)"
+}

packages/rocketchat-github-enterprise/i18n/es.i18n.json

@@ -3,5 +3,5 @@
   "API_GitHub_Enterprise_URL" : "URL del Servidor",
   "Accounts_OAuth_GitHub_Enterprise_id" : "Id de Cliente",
   "Accounts_OAuth_GitHub_Enterprise_secret" : "Secreto de Cliente",
-  "Github_Enterprise_Url_No_Trail" : "Ejemplo: http://domain.com (sin incluir la diagonal final)"
-}
\ No newline at end of file
+  "API_GitHub_Enterprise_URL_Description" : "Ejemplo: http://domain.com (sin incluir la diagonal final)"
+}

packages/rocketchat-github-enterprise/i18n/fi.i18n.json

@@ -3,5 +3,5 @@
   "API_GitHub_Enterprise_URL" : "Server URL",
   "Accounts_OAuth_GitHub_Enterprise_id" : "Client ID",
   "Accounts_OAuth_GitHub_Enterprise_secret" : "Client Secret",
-  "Github_Enterprise_Url_No_Trail" : "Esim: http://example.com (ei kauttaviivaa loppuun)"
-}
\ No newline at end of file
+  "API_GitHub_Enterprise_URL_Description" : "Esim: http://example.com (ei kauttaviivaa loppuun)"
+}

packages/rocketchat-github-enterprise/i18n/fr.i18n.json

@@ -3,5 +3,5 @@
   "API_GitHub_Enterprise_URL" : "URL du serveur",
   "Accounts_OAuth_GitHub_Enterprise_id" : "ID client",
   "Accounts_OAuth_GitHub_Enterprise_secret" : "Secret du client",
-  "Github_Enterprise_Url_No_Trail" : "Exemple: http://domain.com (sans slash final)"
-}
\ No newline at end of file
+  "API_GitHub_Enterprise_URL_Description" : "Exemple: http://domain.com (sans slash final)"
+}

packages/rocketchat-github-enterprise/i18n/km.i18n.json

@@ -3,5 +3,5 @@
   "API_GitHub_Enterprise_URL" : "GitHub Enterprise",
   "Accounts_OAuth_GitHub_Enterprise_id" : "លេខសម្គាល់ Client",
   "Accounts_OAuth_GitHub_Enterprise_secret" : "Client សម្ងាត់",
-  "Github_Enterprise_Url_No_Trail" : "ចំណាំ: សូមដកចេញនូវ trailing slash"
-}
\ No newline at end of file
+  "API_GitHub_Enterprise_URL_Description" : "ចំណាំ: សូមដកចេញនូវ trailing slash"
+}

packages/rocketchat-github-enterprise/i18n/ko.i18n.json

@@ -3,5 +3,5 @@
   "API_GitHub_Enterprise_URL" : "Server URL",
   "Accounts_OAuth_GitHub_Enterprise_id" : "Client ID",
   "Accounts_OAuth_GitHub_Enterprise_secret" : "Client 암호",
-  "Github_Enterprise_Url_No_Trail" : "예: http://domain.com (마지막 슬래시 제외)"
-}
\ No newline at end of file
+  "API_GitHub_Enterprise_URL_Description" : "예: http://domain.com (마지막 슬래시 제외)"
+}

packages/rocketchat-github-enterprise/i18n/nl.i18n.json

@@ -3,5 +3,5 @@
   "API_GitHub_Enterprise_URL" : "Server URL",
   "Accounts_OAuth_GitHub_Enterprise_id" : "Client Id",
   "Accounts_OAuth_GitHub_Enterprise_secret" : "Client Secret",
-  "Github_Enterprise_Url_No_Trail" : "Voorbeeld: http://domain.com (exclusief slash)"
-}
\ No newline at end of file
+  "API_GitHub_Enterprise_URL_Description" : "Voorbeeld: http://domain.com (exclusief slash)"
+}

packages/rocketchat-github-enterprise/i18n/pl.i18n.json

@@ -3,5 +3,5 @@
   "API_GitHub_Enterprise_URL" : "Adres serwera",
   "Accounts_OAuth_GitHub_Enterprise_id" : "Client Id",
   "Accounts_OAuth_GitHub_Enterprise_secret" : "Client Secret",
-  "Github_Enterprise_Url_No_Trail" : "Przykład: http://domain.com (bez końcowego ukośnika)"
-}
\ No newline at end of file
+  "API_GitHub_Enterprise_URL_Description" : "Przykład: http://domain.com (bez końcowego ukośnika)"
+}

packages/rocketchat-github-enterprise/i18n/pt.i18n.json

@@ -3,5 +3,5 @@
   "API_GitHub_Enterprise_URL" : "URL do servidor",
   "Accounts_OAuth_GitHub_Enterprise_id" : "GitHub Id",
   "Accounts_OAuth_GitHub_Enterprise_secret" : "Segredo",
-  "Github_Enterprise_Url_No_Trail" : "Nota: excluir barra final"
-}
\ No newline at end of file
+  "API_GitHub_Enterprise_URL_Description" : "Nota: excluir barra final"
+}

packages/rocketchat-github-enterprise/i18n/ro.i18n.json

@@ -3,5 +3,5 @@
   "API_GitHub_Enterprise_URL" : "URL-ul serverului",
   "Accounts_OAuth_GitHub_Enterprise_id" : "Client ID",
   "Accounts_OAuth_GitHub_Enterprise_secret" : "Client Secret",
-  "Github_Enterprise_Url_No_Trail" : "Exemplu: http://domain.com (fără '/' la final)"
-}
\ No newline at end of file
+  "API_GitHub_Enterprise_URL_Description" : "Exemplu: http://domain.com (fără '/' la final)"
+}

packages/rocketchat-github-enterprise/i18n/zh.i18n.json

@@ -3,5 +3,5 @@
   "API_GitHub_Enterprise_URL" : "GitHub 企业版地址",
   "Accounts_OAuth_GitHub_Enterprise_id" : "客户端 ID",
   "Accounts_OAuth_GitHub_Enterprise_secret" : "客户端 Secret",
-  "Github_Enterprise_Url_No_Trail" : "例如：http://domain.com （不需要结尾的斜线）"
-}
\ No newline at end of file
+  "API_GitHub_Enterprise_URL_Description" : "例如：http://domain.com （不需要结尾的斜线）"
+}

packages/rocketchat-github-enterprise/package.js

 Package.describe({
-    name: 'rocketchat:github-enterprise',
-    version: '0.0.1',
-    summary: 'RocketChat settings for GitHub Enterprise Oauth Flow'
+	name: 'rocketchat:github-enterprise',
+	version: '0.0.1',
+	summary: 'RocketChat settings for GitHub Enterprise Oauth Flow'
 });
 
 Package.onUse(function(api) {
-    api.versionsFrom('1.0');
+	api.versionsFrom('1.0');
 
-    api.use('coffeescript');
-    api.use('rocketchat:lib');
-    api.use('rocketchat:custom-oauth');
+	api.use('coffeescript');
+	api.use('rocketchat:lib');
+	api.use('rocketchat:custom-oauth');
 
-    api.addFiles('startup.coffee', 'server');
-    api.addFiles('github-enterprise-login-button.css', 'client');
-    api.addFiles('common.coffee');
-
-    // TAPi18n
-    api.use('templating', 'client');
-    var _ = Npm.require('underscore');
-    var fs = Npm.require('fs');
-    tapi18nFiles = _.compact(_.map(fs.readdirSync('packages/rocketchat-github-enterprise/i18n'), function(filename) {
-        if (fs.statSync('packages/rocketchat-github-enterprise/i18n/' + filename).size > 16) {
-            return 'i18n/' + filename;
-        }
-    }));
-    api.use('tap:i18n');
-    api.addFiles(tapi18nFiles);
-
-});
-
-Package.onTest(function(api) {
+	api.addFiles('common.coffee');
+	api.addFiles('github-enterprise-login-button.css', 'client');
+	api.addFiles('startup.coffee', 'server');
 
+	// TAPi18n
+	api.use('templating', 'client');
+	var _ = Npm.require('underscore');
+	var fs = Npm.require('fs');
+	var tapi18nFiles = _.compact(_.map(fs.readdirSync('packages/rocketchat-github-enterprise/i18n'), function(filename) {
+		if (fs.statSync('packages/rocketchat-github-enterprise/i18n/' + filename).size > 16) {
+			return 'i18n/' + filename;
+		}
+	}));
+	api.use('tap:i18n');
+	api.addFiles(tapi18nFiles);
 });

packages/rocketchat-github-enterprise/startup.coffee

-
-Meteor.startup ->
-  RocketChat.settings.add 'Accounts_OAuth_GitHub_Enterprise', false, {type: 'boolean', group: 'Accounts', section: 'GitHub Enterprise', i18nLabel: 'Accounts_OAuth_GitHub_Enterprise'}
-  RocketChat.settings.add 'API_GitHub_Enterprise_URL', '', { type: 'string', group: 'Accounts', public: true, section: 'GitHub Enterprise', i18nLabel: 'API_GitHub_Enterprise_URL', i18nDescription: 'Github_Enterprise_Url_No_Trail' }
-  RocketChat.settings.add	'Accounts_OAuth_GitHub_Enterprise_id', '', { type: 'string', group: 'Accounts', section: 'GitHub Enterprise', i18nLabel: 'Accounts_OAuth_GitHub_Enterprise_id' }
-  RocketChat.settings.add	'Accounts_OAuth_GitHub_Enterprise_secret', '', { type: 'string', group: 'Accounts', section: 'GitHub Enterprise', i18nLabel: 'Accounts_OAuth_GitHub_Enterprise_secret' }
-  RocketChat.settings.add	'Accounts_OAuth_GitHub_Enterprise_callback_url', __meteor_runtime_config__?.ROOT_URL + '_oauth/github_enterprise', { type: 'string', blocked: true }
\ No newline at end of file
+RocketChat.settings.addGroup 'Accounts', ->
+	@section 'GitHub Enterprise', ->
+		enableQuery = {_id: 'Accounts_OAuth_GitHub_Enterprise', value: true}
+		@add 'Accounts_OAuth_GitHub_Enterprise', false, {type: 'boolean'}
+		@add 'API_GitHub_Enterprise_URL', '', { type: 'string', public: true, enableQuery: enableQuery, i18nDescription: 'API_GitHub_Enterprise_URL_Description' }
+		@add 'Accounts_OAuth_GitHub_Enterprise_id', '', { type: 'string', enableQuery: enableQuery }
+		@add 'Accounts_OAuth_GitHub_Enterprise_secret', '', { type: 'string', enableQuery: enableQuery }
+		@add 'Accounts_OAuth_GitHub_Enterprise_callback_url', __meteor_runtime_config__?.ROOT_URL + '_oauth/github_enterprise', { type: 'string', blocked: true }

packages/rocketchat-gitlab/package.js

 Package.describe({
-    name: 'rocketchat:gitlab',
-    version: '0.0.1',
-    summary: 'RocketChat settings for GitLab Oauth Flow'
+	name: 'rocketchat:gitlab',
+	version: '0.0.1',
+	summary: 'RocketChat settings for GitLab Oauth Flow'
 });
 
 Package.onUse(function(api) {
-    api.versionsFrom('1.0');
+	api.versionsFrom('1.0');
 
-    api.use('coffeescript');
-    api.use('rocketchat:lib');
-    api.use('rocketchat:custom-oauth');
+	api.use('coffeescript');
+	api.use('rocketchat:lib');
+	api.use('rocketchat:custom-oauth');
 
-    api.addFiles("common.coffee");
-    api.addFiles('gitlab-login-button.css', 'client');
-    api.addFiles('startup.coffee', 'server');
-
-    // TAPi18n
-    api.use('templating', 'client');
-    var _ = Npm.require('underscore');
-    var fs = Npm.require('fs');
-    tapi18nFiles = _.compact(_.map(fs.readdirSync('packages/rocketchat-gitlab/i18n'), function(filename) {
-        if (fs.statSync('packages/rocketchat-gitlab/i18n/' + filename).size > 16) {
-            return 'i18n/' + filename;
-        }
-    }));
-    api.use('tap:i18n');
-    api.addFiles(tapi18nFiles);
-});
-
-Package.onTest(function(api) {
+	api.addFiles('common.coffee');
+	api.addFiles('gitlab-login-button.css', 'client');
+	api.addFiles('startup.coffee', 'server');
 
+	// TAPi18n
+	api.use('templating', 'client');
+	var _ = Npm.require('underscore');
+	var fs = Npm.require('fs');
+	var tapi18nFiles = _.compact(_.map(fs.readdirSync('packages/rocketchat-gitlab/i18n'), function(filename) {
+		if (fs.statSync('packages/rocketchat-gitlab/i18n/' + filename).size > 16) {
+			return 'i18n/' + filename;
+		}
+	}));
+	api.use('tap:i18n');
+	api.addFiles(tapi18nFiles);
 });

packages/rocketchat-gitlab/startup.coffee

-RocketChat.settings.add 'API_Gitlab_URL', '', { type: 'string', group: 'API', public: true }
+RocketChat.settings.addGroup 'Accounts', ->
+	@section 'Gitlab', ->
+		enableQuery = {_id: 'Accounts_OAuth_Gitlab', value: true}
+		@add 'Accounts_OAuth_Gitlab', false, { type: 'boolean', public: true }
+		@add 'API_Gitlab_URL', '', { type: 'string', enableQuery: enableQuery, public: true}
+		@add 'Accounts_OAuth_Gitlab_id', '', { type: 'string', enableQuery: enableQuery }
+		@add 'Accounts_OAuth_Gitlab_secret', '', { type: 'string', enableQuery: enableQuery }
+		@add 'Accounts_OAuth_Gitlab_callback_url', __meteor_runtime_config__?.ROOT_URL + '_oauth/gitlab', { type: 'string', blocked: true }

packages/rocketchat-lib/server/startup/settings.coffee

@@ -49,12 +49,6 @@ RocketChat.settings.addGroup 'Accounts', ->
 		@add 'Accounts_OAuth_Github_secret', '', { type: 'string', enableQuery: {_id: 'Accounts_OAuth_Github', value: true} }
 		@add 'Accounts_OAuth_Github_callback_url', __meteor_runtime_config__?.ROOT_URL + '_oauth/github', { type: 'string', blocked: true }
 
-	@section 'Gitlab', ->
-		@add 'Accounts_OAuth_Gitlab', false, { type: 'boolean', public: true }
-		@add 'Accounts_OAuth_Gitlab_id', '', { type: 'string', enableQuery: {_id: 'Accounts_OAuth_Gitlab', value: true} }
-		@add 'Accounts_OAuth_Gitlab_secret', '', { type: 'string', enableQuery: {_id: 'Accounts_OAuth_Gitlab', value: true} }
-		@add 'Accounts_OAuth_Gitlab_callback_url', __meteor_runtime_config__?.ROOT_URL + '_oauth/gitlab', { type: 'string', blocked: true }
-
 	@section 'Linkedin', ->
 		@add 'Accounts_OAuth_Linkedin', false, { type: 'boolean', public: true }
 		@add 'Accounts_OAuth_Linkedin_id', '', { type: 'string', enableQuery: {_id: 'Accounts_OAuth_Linkedin', value: true} }