summaryrefslogtreecommitdiff
path: root/app/Template/user
diff options
context:
space:
mode:
Diffstat (limited to 'app/Template/user')
-rw-r--r--app/Template/user/authentication.php3
-rw-r--r--app/Template/user/create_remote.php3
-rw-r--r--app/Template/user/external.php18
3 files changed, 23 insertions, 1 deletions
diff --git a/app/Template/user/authentication.php b/app/Template/user/authentication.php
index a62c8f93..20c3d372 100644
--- a/app/Template/user/authentication.php
+++ b/app/Template/user/authentication.php
@@ -14,6 +14,9 @@
<?= $this->form->label(t('Github Id'), 'github_id') ?>
<?= $this->form->text('github_id', $values, $errors) ?>
+ <?= $this->form->label(t('Gitlab Id'), 'gitlab_id') ?>
+ <?= $this->form->text('gitlab_id', $values, $errors) ?>
+
<?= $this->form->checkbox('is_ldap_user', t('Remote user'), 1, isset($values['is_ldap_user']) && $values['is_ldap_user'] == 1) ?>
<?= $this->form->checkbox('disable_login_form', t('Disallow login form'), 1, isset($values['disable_login_form']) && $values['disable_login_form'] == 1) ?>
diff --git a/app/Template/user/create_remote.php b/app/Template/user/create_remote.php
index 6b3678d3..1d04bc87 100644
--- a/app/Template/user/create_remote.php
+++ b/app/Template/user/create_remote.php
@@ -25,6 +25,9 @@
<?= $this->form->label(t('Github Id'), 'github_id') ?>
<?= $this->form->password('github_id', $values, $errors) ?><br/>
+
+ <?= $this->form->label(t('Gitlab Id'), 'gitlab_id') ?>
+ <?= $this->form->password('gitlab_id', $values, $errors) ?><br/>
</div>
<div class="form-column">
diff --git a/app/Template/user/external.php b/app/Template/user/external.php
index 3b872e85..9ef0b4d1 100644
--- a/app/Template/user/external.php
+++ b/app/Template/user/external.php
@@ -34,6 +34,22 @@
</p>
<?php endif ?>
-<?php if (! GOOGLE_AUTH && ! GITHUB_AUTH): ?>
+<?php if (GITHUB_AUTH): ?>
+ <h3><img src="<?= $this->url->dir() ?>assets/img/gitlab-icon.png"/>&nbsp;<?= t('Gitlab Account') ?></h3>
+
+ <p class="listing">
+ <?php if ($this->user->isCurrentUser($user['id'])): ?>
+ <?php if (empty($user['gitlab_id'])): ?>
+ <?= $this->url->link(t('Link my Gitlab Account'), 'oauth', 'gitlab', array(), true) ?>
+ <?php else: ?>
+ <?= $this->url->link(t('Unlink my Gitlab Account'), 'oauth', 'unlink', array('backend' => 'gitlab'), true) ?>
+ <?php endif ?>
+ <?php else: ?>
+ <?= empty($user['gitlab_id']) ? t('No account linked.') : t('Account linked.') ?>
+ <?php endif ?>
+ </p>
+<?php endif ?>
+
+<?php if (! GOOGLE_AUTH && ! GITHUB_AUTH && ! GITLAB_AUTH): ?>
<p class="alert"><?= t('No external authentication enabled.') ?></p>
<?php endif ?>