summaryrefslogtreecommitdiff
path: root/app/Model
diff options
context:
space:
mode:
Diffstat (limited to 'app/Model')
-rw-r--r--app/Model/Acl.php3
-rw-r--r--app/Model/User.php6
2 files changed, 4 insertions, 5 deletions
diff --git a/app/Model/Acl.php b/app/Model/Acl.php
index 579b5d90..dfdc82d2 100644
--- a/app/Model/Acl.php
+++ b/app/Model/Acl.php
@@ -18,13 +18,12 @@ class Acl extends Base
*/
private $public_acl = array(
'auth' => array('login', 'check'),
- 'user' => array('github'),
'task' => array('readonly'),
'board' => array('readonly'),
'webhook' => '*',
'ical' => '*',
'feed' => '*',
- 'oauth' => array('google'),
+ 'oauth' => array('google', 'github'),
);
/**
diff --git a/app/Model/User.php b/app/Model/User.php
index 4c32942c..36b7194c 100644
--- a/app/Model/User.php
+++ b/app/Model/User.php
@@ -122,13 +122,13 @@ class User extends Base
}
/**
- * Get a specific user by the GitHub id
+ * Get a specific user by the Github id
*
* @access public
- * @param string $github_id GitHub user id
+ * @param string $github_id Github user id
* @return array|boolean
*/
- public function getByGitHubId($github_id)
+ public function getByGithubId($github_id)
{
if (empty($github_id)) {
return false;