From 8eb739bb910fb91737c6ce65f244eb9a3ac8f35c Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Sun, 23 Aug 2015 13:15:59 -0400 Subject: Add Gitlab authentication --- app/Template/user/authentication.php | 3 +++ app/Template/user/create_remote.php | 3 +++ app/Template/user/external.php | 18 +++++++++++++++++- 3 files changed, 23 insertions(+), 1 deletion(-) (limited to 'app/Template/user') 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 @@ form->label(t('Github Id'), 'github_id') ?> form->text('github_id', $values, $errors) ?> + form->label(t('Gitlab Id'), 'gitlab_id') ?> + form->text('gitlab_id', $values, $errors) ?> + form->checkbox('is_ldap_user', t('Remote user'), 1, isset($values['is_ldap_user']) && $values['is_ldap_user'] == 1) ?> 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 @@ form->label(t('Github Id'), 'github_id') ?> form->password('github_id', $values, $errors) ?>
+ + form->label(t('Gitlab Id'), 'gitlab_id') ?> + form->password('gitlab_id', $values, $errors) ?>
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 @@

- + +

 

+ +

+ user->isCurrentUser($user['id'])): ?> + + url->link(t('Link my Gitlab Account'), 'oauth', 'gitlab', array(), true) ?> + + url->link(t('Unlink my Gitlab Account'), 'oauth', 'unlink', array('backend' => 'gitlab'), true) ?> + + + + +

+ + +

-- cgit v1.2.3