From da21210f621c1a599d27ad58bb826e0e3e523c58 Mon Sep 17 00:00:00 2001 From: Eric Sethna Date: Fri, 26 Feb 2016 11:48:10 -0800 Subject: Update gitlab_settings.jsx --- web/react/components/admin_console/gitlab_settings.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'web') diff --git a/web/react/components/admin_console/gitlab_settings.jsx b/web/react/components/admin_console/gitlab_settings.jsx index 744fa3b19..ad9950eea 100644 --- a/web/react/components/admin_console/gitlab_settings.jsx +++ b/web/react/components/admin_console/gitlab_settings.jsx @@ -167,7 +167,7 @@ class GitLabSettings extends React.Component {
@@ -376,4 +376,4 @@ GitLabSettings.propTypes = { config: React.PropTypes.object }; -export default injectIntl(GitLabSettings); \ No newline at end of file +export default injectIntl(GitLabSettings); -- cgit v1.2.3-1-g7c22 From e03b4ce51b713588b044cd5e21beb7667c10c88d Mon Sep 17 00:00:00 2001 From: Eric Sethna Date: Fri, 26 Feb 2016 11:49:14 -0800 Subject: Update en.json --- web/static/i18n/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web') diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json index 32ceb494f..14d0e2e27 100644 --- a/web/static/i18n/en.json +++ b/web/static/i18n/en.json @@ -97,7 +97,7 @@ "admin.email.testing": "Testing...", "admin.email.true": "true", "admin.gitab.clientSecretDescription": "Obtain this value via the instructions above for logging into GitLab.", - "admin.gitlab.EnableHtmlDesc": "
  1. Log in to your GitLab account and go to Applications -> Profile Settings.
  2. Enter Redirect URIs \"/login/gitlab/complete\" (example: http://localhost:8065/login/gitlab/complete) and \"/signup/gitlab/complete\".
  3. Then use \"Secret\" and \"Id\" fields from GitLab to complete the options below.
  4. Complete the Endpoint URLs below.
", + "admin.gitlab.EnableHtmlDesc": "
  1. Log in to your GitLab account and go to Profile Settings -> Applications.
  2. Enter Redirect URIs \"/login/gitlab/complete\" (example: http://localhost:8065/login/gitlab/complete) and \"/signup/gitlab/complete\".
  3. Then use \"Secret\" and \"Id\" fields from GitLab to complete the options below.
  4. Complete the Endpoint URLs below.
", "admin.gitlab.authDescription": "Enter https:///oauth/authorize (example https://example.com:3000/oauth/authorize). Make sure you use HTTP or HTTPS in your URL depending on your server configuration.", "admin.gitlab.authExample": "Ex \"\"", "admin.gitlab.authTitle": "Auth Endpoint:", -- cgit v1.2.3-1-g7c22 From 90ef9aef635e1bd75a65303b8f264154697181b6 Mon Sep 17 00:00:00 2001 From: Eric Sethna Date: Fri, 26 Feb 2016 11:51:05 -0800 Subject: Update es.json --- web/static/i18n/es.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web') diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json index 30a501a7e..407994d1a 100644 --- a/web/static/i18n/es.json +++ b/web/static/i18n/es.json @@ -97,7 +97,7 @@ "admin.email.testing": "Probando...", "admin.email.true": "verdadero", "admin.gitab.clientSecretDescription": "Utilizar este valor vía instrucciones suministradas anteriormente para iniciar sesión en GitLab.", - "admin.gitlab.EnableHtmlDesc": "
  1. Inicia sesión con tu cuenta en GitLab y dirigete a Applications -> Profile Settings.
  2. Ingresa los URIs \"/login/gitlab/complete\" (ejemplo: http://localhost:8065/login/gitlab/complete) y \"/signup/gitlab/complete\".
  3. Luego utiliza los valores de los campos \"Secret\" e \"Id\" de GitLab y completa las opciones que abajo se presentan.
  4. Completa las dirección URLs abajo.
", + "admin.gitlab.EnableHtmlDesc": "
  1. Inicia sesión con tu cuenta en GitLab y dirigete a Profile Settings -> Applications.
  2. Ingresa los URIs \"/login/gitlab/complete\" (ejemplo: http://localhost:8065/login/gitlab/complete) y \"/signup/gitlab/complete\".
  3. Luego utiliza los valores de los campos \"Secret\" e \"Id\" de GitLab y completa las opciones que abajo se presentan.
  4. Completa las dirección URLs abajo.
", "admin.gitlab.authDescription": "Ingresar /oauth/authorize (example http://localhost:3000/oauth/authorize). Asegurate que si utilizas HTTPS o HTTPS tus URLS sean correctas", "admin.gitlab.authExample": "Ej \"\"", "admin.gitlab.authTitle": "URL para autentificación:", -- cgit v1.2.3-1-g7c22 From 2da3c508eef2dff28163572fbfc3f6a5469fa0ef Mon Sep 17 00:00:00 2001 From: Eric Sethna Date: Fri, 26 Feb 2016 11:52:23 -0800 Subject: Update pt.json --- web/static/i18n/pt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'web') diff --git a/web/static/i18n/pt.json b/web/static/i18n/pt.json index ed2399799..99ab8f017 100644 --- a/web/static/i18n/pt.json +++ b/web/static/i18n/pt.json @@ -97,7 +97,7 @@ "admin.email.testing": "Testando...", "admin.email.true": "verdadeiro", "admin.gitab.clientSecretDescription": "Obter este valor de acordo com as instruções acima para logar no GitLab.", - "admin.gitlab.EnableHtmlDesc": "
  1. Faça login na sua conta do GitLab e vá para Aplicativos -> Configurações do perfil.
  2. Digite redirecionamento URIs \"/login/gitlab/complete\" (exemplo: http://localhost:8065/login/gitlab/complete) e \"/signup/gitlab/complete\".
  3. Em seguida, use os campos \"Secret\" e \"Id\" do Gitlab para completar as opções abaixo.
  4. Complete o Endpoint com as URLs abaixo.
", + "admin.gitlab.EnableHtmlDesc": "
  1. Faça login na sua conta do GitLab e vá para Configurações do perfil -> Aplicativos.
  2. Digite redirecionamento URIs \"/login/gitlab/complete\" (exemplo: http://localhost:8065/login/gitlab/complete) e \"/signup/gitlab/complete\".
  3. Em seguida, use os campos \"Secret\" e \"Id\" do Gitlab para completar as opções abaixo.
  4. Complete o Endpoint com as URLs abaixo.
", "admin.gitlab.authDescription": "Entre https:///oauth/authorize (exemplo https://example.com:3000/oauth/authorize). Tenha certeza de usar HTTP ou HTTPS na sua URL dependendo da configuração do seu servidor.", "admin.gitlab.authExample": "Ex \"\"", "admin.gitlab.authTitle": "Autenticação Endpoint:", @@ -1274,4 +1274,4 @@ "view_image_popover.download": "Download", "view_image_popover.file": "Arquivo {count} de {total}", "view_image_popover.publicLink": "Obter O Link Público" -} \ No newline at end of file +} -- cgit v1.2.3-1-g7c22