diff --git a/lib/scm/gitlab.class.php b/lib/scm/gitlab.class.php
index c84be1287b..40978f234f 100644
--- a/lib/scm/gitlab.class.php
+++ b/lib/scm/gitlab.class.php
@@ -561,6 +561,8 @@ class gitlab
         $commits = array();
         foreach($list as $commit)
         {
+            if(!is_object($commit)) continue;
+
             $log = new stdclass;
             $log->committer = $commit->committer_name;
             $log->revision  = $commit->id;
diff --git a/module/gitlab/control.php b/module/gitlab/control.php
index 695e8be1d6..e56cae595d 100644
--- a/module/gitlab/control.php
+++ b/module/gitlab/control.php
@@ -967,6 +967,7 @@ class gitlab extends control
         $repo           = $this->loadModel('repo')->getRepoByID($repoID);
         $users          = $this->loadModel('user')->getPairs('noletter|noempty|nodeleted|noclosed');
         $projectMembers = $this->gitlab->apiGetProjectMembers($repo->gitlab, $repo->project);
+        if(!is_array($projectMembers)) $projectMembers = array();
 
         /* Get users accesslevel. */
         $userAccessData = array();
@@ -975,6 +976,7 @@ class gitlab extends control
             ->where('providerType')->eq('gitlab')
             ->andWhere('providerID')->eq($repo->gitlab)
             ->fetchPairs();
+
         foreach($projectMembers as $projectMember)
         {
             if(isset($projectMember->id) and isset($bindedUsers[$projectMember->id]))
diff --git a/module/gitlab/lang/en.php b/module/gitlab/lang/en.php
index 90ab7493ac..9f8c121859 100644
--- a/module/gitlab/lang/en.php
+++ b/module/gitlab/lang/en.php
@@ -33,9 +33,9 @@ $lang->gitlab->gitlabIssue          = "GitLab Issue";
 $lang->gitlab->zentaoProduct        = 'Zentao Product';
 $lang->gitlab->objectType           = 'Type'; // task, bug, story
 $lang->gitlab->manageProjectMembers = 'Manage project member';
-$lang->gitlab->createProject        = 'Create Gitlab project';
-$lang->gitlab->editProject          = 'Eidt Gitlab project';
-$lang->gitlab->deleteProject        = 'Delete Gitlab project';
+$lang->gitlab->createProject        = 'Create GitLab project';
+$lang->gitlab->editProject          = 'Eidt GitLab project';
+$lang->gitlab->deleteProject        = 'Delete GitLab project';
 $lang->gitlab->createGroup          = 'Create group';
 $lang->gitlab->editGroup            = 'Edit group';
 $lang->gitlab->deleteGroup          = 'Delete group';
@@ -78,14 +78,20 @@ $lang->gitlab->accessLevels[40] = 'Maintainer';
 $lang->gitlab->accessLevels[50] = 'Owner';
 
 $lang->gitlab->apiError[0] = 'internal is not allowed in a private group.';
+$lang->gitlab->apiError[1] = 'public is not allowed in a private group.';
+$lang->gitlab->apiError[2] = 'is too short (minimum is 8 characters)';
+$lang->gitlab->apiError[3] = "can contain only letters, digits, '_', '-' and '.'. Cannot start with '-', end in '.git' or end in '.atom'";
 
-$lang->gitlab->errorLang[0] = 'You cannot set Internal as its Visibility Level, if it is private in Gitlab.';
+$lang->gitlab->errorLang[0] = 'You cannot set Internal as its Visibility Level, if it is private in GitLab.';
+$lang->gitlab->errorLang[1] = 'You cannot set Public as its Visibility Level, if it is private in GitLab.';
+$lang->gitlab->errorLang[2] = 'Is too short (minimum is 8 characters)';
+$lang->gitlab->errorLang[3] = 'It should contain only letters, digits, underscore, hyphen and period.  It should not start with hypen, or end with .git or .atom.';
 
 $lang->gitlab->project = new stdclass;
 $lang->gitlab->project->id                         = "Project ID";
 $lang->gitlab->project->name                       = "Project name";
-$lang->gitlab->project->create                     = "Create Gitlab project";
-$lang->gitlab->project->edit                       = "Edit Gitlab project";
+$lang->gitlab->project->create                     = "Create GitLab project";
+$lang->gitlab->project->edit                       = "Edit GitLab project";
 $lang->gitlab->project->url                        = "Project URL";
 $lang->gitlab->project->path                       = "Project slug";
 $lang->gitlab->project->description                = "Project description";
@@ -102,7 +108,7 @@ $lang->gitlab->project->tagListTips                = "Separate topics with comma
 $lang->gitlab->project->emptyNameError             = "Project name cannot be empty.";
 $lang->gitlab->project->emptyPathError             = "Project slug cannot be empty.";
 $lang->gitlab->project->confirmDelete              = 'Do you want to delete this GitLab project?';
-$lang->gitlab->project->notbindedError             = 'Gitlab user has not been bound, unable to modify permissions!';
+$lang->gitlab->project->notbindedError             = 'GitLab user has not been bound, unable to modify permissions!';
 
 $lang->gitlab->user = new stdclass;
 $lang->gitlab->user->id             = "User ID";
@@ -124,8 +130,8 @@ $lang->gitlab->user->websiteUrl     = "Website url";
 $lang->gitlab->user->note           = "Note";
 $lang->gitlab->user->createOn       = "Created on";
 $lang->gitlab->user->lastActivity   = "Last activity";
-$lang->gitlab->user->create         = "Create Gitlab user";
-$lang->gitlab->user->edit           = "Edit Gitlab user";
+$lang->gitlab->user->create         = "Create GitLab user";
+$lang->gitlab->user->edit           = "Edit GitLab user";
 $lang->gitlab->user->emptyError     = "cannot be empty";
 $lang->gitlab->user->passwordError  = "The second password is inconsistent!";
 $lang->gitlab->user->bindError      = "The user has been bound!";
diff --git a/module/gitlab/lang/zh-cn.php b/module/gitlab/lang/zh-cn.php
index bf65a66160..22ce25c368 100644
--- a/module/gitlab/lang/zh-cn.php
+++ b/module/gitlab/lang/zh-cn.php
@@ -33,9 +33,9 @@ $lang->gitlab->gitlabIssue          = "{$lang->gitlab->common} issue";
 $lang->gitlab->zentaoProduct        = '禅道产品';
 $lang->gitlab->objectType           = '类型'; // task, bug, story
 $lang->gitlab->manageProjectMembers = '项目成员管理';
-$lang->gitlab->createProject        = '添加Gitlab项目';
-$lang->gitlab->editProject          = '编辑Gitlab项目';
-$lang->gitlab->deleteProject        = '删除Gitlab项目';
+$lang->gitlab->createProject        = '添加GitLab项目';
+$lang->gitlab->editProject          = '编辑GitLab项目';
+$lang->gitlab->deleteProject        = '删除GitLab项目';
 $lang->gitlab->createGroup          = '添加群组';
 $lang->gitlab->editGroup            = '编辑群组';
 $lang->gitlab->deleteGroup          = '删除群组';
@@ -59,7 +59,7 @@ $lang->gitlab->tips       = '使用密码时，请在GitLab全局安全设置中
 
 $lang->gitlab->placeholder = new stdclass;
 $lang->gitlab->placeholder->name        = '';
-$lang->gitlab->placeholder->url         = "请填写Gitlab Server首页的访问地址，如：https://gitlab.zentao.net。";
+$lang->gitlab->placeholder->url         = "请填写GitLab Server首页的访问地址，如：https://gitlab.zentao.net。";
 $lang->gitlab->placeholder->token       = "请填写具有admin权限账户的access token";
 $lang->gitlab->placeholder->projectPath = "项目标识串只能包含字母、数字、“_”、“-”和“.”。不能以“-”开头，以.git或者.atom结尾";
 
@@ -79,15 +79,19 @@ $lang->gitlab->accessLevels[50] = 'Owner';
 
 $lang->gitlab->apiError[0] = 'internal is not allowed in a private group.';
 $lang->gitlab->apiError[1] = 'public is not allowed in a private group.';
+$lang->gitlab->apiError[2] = 'is too short (minimum is 8 characters)';
+$lang->gitlab->apiError[3] = "can contain only letters, digits, '_', '-' and '.'. Cannot start with '-', end in '.git' or end in '.atom'";
 
 $lang->gitlab->errorLang[0] = '私有分组的项目，可见性级别不能设为内部。';
 $lang->gitlab->errorLang[1] = '私有分组的项目，可见性级别不能设为公开。';
+$lang->gitlab->errorLang[2] = '太短（最少8个字符）';
+$lang->gitlab->errorLang[3] = "只能包含字母、数字、'.'-'和'.'。不能以'-'开头、以'.git'结尾或以'.atom'结尾。";
 
 $lang->gitlab->project = new stdclass;
 $lang->gitlab->project->id                         = "项目ID";
 $lang->gitlab->project->name                       = "项目名称";
-$lang->gitlab->project->create                     = "添加Gitlab项目";
-$lang->gitlab->project->edit                       = "编辑Gitlab项目";
+$lang->gitlab->project->create                     = "添加GitLab项目";
+$lang->gitlab->project->edit                       = "编辑GitLab项目";
 $lang->gitlab->project->url                        = "项目 URL";
 $lang->gitlab->project->path                       = "项目标识串";
 $lang->gitlab->project->description                = "项目描述";
@@ -104,7 +108,7 @@ $lang->gitlab->project->tagListTips                = "用逗号分隔主题。";
 $lang->gitlab->project->emptyNameError             = "项目名称不能为空";
 $lang->gitlab->project->emptyPathError             = "项目标识串不能为空";
 $lang->gitlab->project->confirmDelete              = '确认删除该GitLab项目吗？';
-$lang->gitlab->project->notbindedError             = '还没绑定Gitlab用户，无法修改权限！';
+$lang->gitlab->project->notbindedError             = '还没绑定GitLab用户，无法修改权限！';
 
 $lang->gitlab->user = new stdclass;
 $lang->gitlab->user->id             = "用户ID";
@@ -126,8 +130,8 @@ $lang->gitlab->user->websiteUrl     = "网站地址";
 $lang->gitlab->user->note           = "备注";
 $lang->gitlab->user->createOn       = "创建于";
 $lang->gitlab->user->lastActivity   = "上次活动";
-$lang->gitlab->user->create         = "添加Gitlab用户";
-$lang->gitlab->user->edit           = "编辑Gitlab用户";
+$lang->gitlab->user->create         = "添加GitLab用户";
+$lang->gitlab->user->edit           = "编辑GitLab用户";
 $lang->gitlab->user->emptyError     = "不能为空";
 $lang->gitlab->user->passwordError  = "二次密码不一致！";
 $lang->gitlab->user->bindError      = "该用户已经被绑定！";
diff --git a/module/gitlab/lang/zh-tw.php b/module/gitlab/lang/zh-tw.php
index a90f58282d..0dfdf81e2a 100644
--- a/module/gitlab/lang/zh-tw.php
+++ b/module/gitlab/lang/zh-tw.php
@@ -38,7 +38,7 @@ $lang->gitlab->tips       = '使用密碼時，請在GitLab全局安全設置中
 
 $lang->gitlab->placeholder = new stdclass;
 $lang->gitlab->placeholder->name  = '';
-$lang->gitlab->placeholder->url   = "請填寫Gitlab Server首頁的訪問地址，如：https://gitlab.zentao.net。";
+$lang->gitlab->placeholder->url   = "請填寫GitLab Server首頁的訪問地址，如：https://gitlab.zentao.net。";
 $lang->gitlab->placeholder->token = "請填寫具有admin權限賬戶的access token";
 
 $lang->gitlab->noImportableIssues = "目前沒有可供導入的issue。";
diff --git a/module/repo/lang/en.php b/module/repo/lang/en.php
index 9bdeda0674..a908cc5891 100644
--- a/module/repo/lang/en.php
+++ b/module/repo/lang/en.php
@@ -128,12 +128,12 @@ $lang->repo->logStyles['D'] = 'Delete';
 $lang->repo->encodingList['utf_8'] = 'UTF-8';
 $lang->repo->encodingList['gbk']   = 'GBK';
 
-$lang->repo->scmList['Gitlab']     = 'Gitlab';
+$lang->repo->scmList['Gitlab']     = 'GitLab';
 $lang->repo->scmList['Git']        = 'Git';
 $lang->repo->scmList['Subversion'] = 'SVN';
 
-$lang->repo->gitlabHost    = 'Gitlab Host';
-$lang->repo->gitlabToken   = 'Gitlab Token';
+$lang->repo->gitlabHost    = 'GitLab Host';
+$lang->repo->gitlabToken   = 'GitLab Token';
 $lang->repo->gitlabProject = 'Project';
 
 $lang->repo->placeholder = new stdclass;
diff --git a/module/repo/lang/zh-cn.php b/module/repo/lang/zh-cn.php
index 4cec692ac4..d75bc9b870 100644
--- a/module/repo/lang/zh-cn.php
+++ b/module/repo/lang/zh-cn.php
@@ -128,7 +128,7 @@ $lang->repo->logStyles['D'] = '删除';
 $lang->repo->encodingList['utf_8'] = 'UTF-8';
 $lang->repo->encodingList['gbk']   = 'GBK';
 
-$lang->repo->scmList['Gitlab']     = 'Gitlab';
+$lang->repo->scmList['Gitlab']     = 'GitLab';
 $lang->repo->scmList['Git']        = '本地 Git';
 $lang->repo->scmList['Subversion'] = 'Subversion';
 
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index 7a952a19a9..56fea24343 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -70,7 +70,7 @@ $lang->task->color             = 'Color';
 $lang->task->name              = 'Name';
 $lang->task->type              = 'Type';
 $lang->task->typeAB            = 'Type';
-$lang->task->sync2Gitlab       = 'Sync to Gitlab';
+$lang->task->sync2Gitlab       = 'Sync to GitLab';
 $lang->task->pri               = 'Priority';
 $lang->task->mailto            = 'Mailto';
 $lang->task->estimate          = 'Estimates';
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index e78b3ee97b..58f414913c 100644
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -71,7 +71,7 @@ $lang->task->color             = '标题颜色';
 $lang->task->name              = '任务名称';
 $lang->task->type              = '任务类型';
 $lang->task->typeAB            = '类型';
-$lang->task->sync2Gitlab       = '同步到Gitlab';
+$lang->task->sync2Gitlab       = '同步到GitLab';
 $lang->task->pri               = '优先级';
 $lang->task->mailto            = '抄送给';
 $lang->task->estimate          = '最初预计';
diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php
index 7abb28a0cb..805623b2cc 100644
--- a/module/task/lang/zh-tw.php
+++ b/module/task/lang/zh-tw.php
@@ -70,7 +70,7 @@ $lang->task->color             = '標題顏色';
 $lang->task->name              = '任務名稱';
 $lang->task->type              = '任務類型';
 $lang->task->typeAB            = '類型';
-$lang->task->sync2Gitlab       = '同步到Gitlab';
+$lang->task->sync2Gitlab       = '同步到GitLab';
 $lang->task->pri               = '優先順序';
 $lang->task->mailto            = '抄送給';
 $lang->task->estimate          = '最初預計';