diff --git a/framework/base/router.class.php b/framework/base/router.class.php
index 2dec604d3a..3a0490f547 100644
--- a/framework/base/router.class.php
+++ b/framework/base/router.class.php
@@ -886,22 +886,6 @@ class baseRouter
         }
     }
 
-    /**
-     * 保存openApp到cookie，下次请求使用，常用在locate, reload方法。
-     * Save openApp to cookie, use it next visit, when locate, reload page.
-     *
-     * @access public
-     * @return void
-     */
-    public function saveOpenApp()
-    {
-        $module = $this->rawModule;
-        if(isset($this->lang->navGroup->$module) and $this->lang->navGroup->$module != $this->openApp)
-        {
-            setCookie('openApp', $this->openApp);
-        }
-    }
-
     /**
      * 根据用户浏览器的语言设置和服务器配置，选择显示的语言。
      * 优先级：$lang参数 > session > cookie > 浏览器 > 配置文件。
diff --git a/lib/scm/gitlab.class.php b/lib/scm/gitlab.class.php
new file mode 100644
index 0000000000..cbe2a0cbad
--- /dev/null
+++ b/lib/scm/gitlab.class.php
@@ -0,0 +1,655 @@
+<?php
+class gitlab
+{
+    public $client;
+    public $projectID;
+
+    /**
+     * Construct 
+     * 
+     * @param  string    $client    gitlab api url.
+     * @param  string    $root      id of gitlab project.
+     * @param  string    $username  null
+     * @param  string    $password  token of gitlab api.
+     * @param  string    $encoding 
+     * @access public
+     * @return void
+     */
+    public function __construct($client, $root, $username, $password, $encoding = 'UTF-8')
+    {
+        $this->client = $client;
+        $this->root   = rtrim($root, '/') . '/';
+        $this->token  = $password;
+        $this->branch = isset($_COOKIE['repoBranch']) ? $_COOKIE['repoBranch'] : '';
+    }
+
+    /**
+     * List files.
+     * 
+     * @param  string $path 
+     * @param  string $revision 
+     * @access public
+     * @return array
+     */
+    public function ls($path, $revision = 'HEAD')
+    {
+        if(!scm::checkRevision($revision)) return array();
+        $api  = "tree";
+
+        $param = new stdclass();
+        $param->path      = urlencode(ltrim($path, '/'));
+        $param->ref       = $revision;
+        $param->recursive = 0;
+
+		$list = $this->fetch($api, $param);
+        if(empty($list)) return array();
+
+        $infos = array();
+        foreach($list as $file)
+        {
+			$info = new stdClass();
+            if($file->type == 'blob') 
+			{
+                $path = $file->path;
+				$file = $this->files($file->path);
+                
+				$info->name     = $file->file_name;
+				$info->kind     = 'file';
+				$info->account  = $file->committer;
+				$info->date     = $file->date;
+				$info->size     = $file->size;
+				$info->comment  = $file->comment;
+				$info->revision = $file->revision;
+			}
+			else
+			{
+				$commits = $this->getCommitsByPath($file->path);
+				if(empty($commits)) continue;
+				$commit = $commits[0];
+
+				$info->name     = $file->path;
+				$info->kind     = 'dir';
+				$info->revision = $commit->id;
+				$info->account  = $commit->committer_name;
+				$info->date     = date('Y-m-d H:i:s', strtotime($commit->committed_date));
+				$info->size     = 0;
+				$info->comment  = $commit->message;
+			}
+
+			$infos[] = $info;
+			unset($info);
+		}
+
+		/* Sort by kind */
+		foreach($infos as $key => $info) $kinds[$key] = $info->kind;
+		if($infos) array_multisort($kinds, SORT_ASC, $infos);
+		return $infos;
+	}
+
+	/**
+	 * Get files info.
+	 * 
+	 * @param  string    $path 
+	 * @param  string    $ref 
+	 * @access public
+	 * @return array
+	 */
+	public function files($path, $ref = 'master')
+	{
+		$path = urlencode($path);
+		$api  = "files/$path";
+		$param = new stdclass();
+		$param->ref = $ref;
+		$file = $this->fetch($api, $param);
+
+		$commits = $this->getCommitsByPath($path);
+		$file->revision = $file->commit_id;
+		$file->size     = $this->formatBytes($file->size);
+
+		if(!empty($commits))
+		{
+			$commit = $commits[0];
+			$file->committer = $commit->committer_name;
+			$file->comment   = $commit->message;
+			$file->date      = date('Y-m-d H:i:s', strtotime($commit->committed_date));
+		}
+
+		return $file;
+	}
+
+	/**
+	 * Get tags 
+	 * 
+	 * @param  string $path 
+	 * @param  string $revision 
+	 * @access public
+	 * @return array
+	 */
+	public function tags($path, $revision = 'HEAD')
+	{
+		$api = "tags";
+        $list = $this->fetch($api);
+
+        $tags = array();
+        foreach($list as $tag) $tags[] = $tag->name;
+
+		return $tags;
+	}
+
+	/**
+	 * Get branch 
+	 * 
+	 * @access public
+	 * @return array
+	 */
+	public function branch()
+	{
+		$api  = "branches";
+		$list = $this->fetch($api);
+
+		$branches = array();
+		foreach($list as $branch) $branches[$branch->name] = $branch->name;
+		asort($branches);
+
+		return $branches;
+	}
+
+	/**
+	 * Get last log. 
+	 * 
+	 * @param  string $path 
+     * @param  int    $count 
+     * @access public
+     * @return array
+     */
+    public function getLastLog($path, $count = 10)
+    {
+        return $this->log($path);
+    }
+
+    /**
+     * Get logs.
+     * 
+     * @param  string $path 
+     * @param  string $fromRevision 
+     * @param  string $toRevision 
+     * @param  int    $count 
+     * @access public
+     * @return array
+     */
+    public function log($path, $fromRevision = 0, $toRevision = 'HEAD', $count = 0)
+    {
+        if(!scm::checkRevision($fromRevision)) return array();
+        if(!scm::checkRevision($toRevision))   return array();
+
+        $path  = ltrim($path, DIRECTORY_SEPARATOR);
+        $count = $count == 0 ? '' : "-n $count";
+
+        $list = $this->getCommitsByPath($path, $fromRevision, $toRevision);
+        foreach($list as $commit) $commit->diffs = $this->getFilesByCommit($commit->id);
+
+        return $this->parseLog($list);
+    }
+
+    /**
+     * Blame file
+     * 
+     * @param  string $path 
+     * @param  string $revision 
+     * @access public
+     * @return array
+     */
+    public function blame($path, $revision)
+    {
+        if(!scm::checkRevision($revision)) return array();
+
+        $path = ltrim($path, DIRECTORY_SEPARATOR);
+		$path = urlencode($path);
+		$api  = "files/$path/blame";
+		$param = new stdclass;
+		$param->ref = $this->branch;
+        $results = $this->fetch($api, $param);
+
+        $blames   = array();
+        $revLine  = 0;
+        $revision = '';
+
+		$lineNumber = 1;
+		foreach($results as $blame)
+		{
+			$line = array();
+			$line['revision']  = $blame->commit->id;
+			$line['committer'] = $blame->commit->committer_name;
+			$line['time']      = $blame->commit->committer_name;
+			$line['line']      = $lineNumber;
+			$line['lines']     = count($blame->lines);
+			$line['content']   = array_shift($blame->lines);
+
+			$blames[] = $line;
+
+			$lineNumber ++;
+
+			foreach($blame->lines as $line)
+			{
+				$blames[] = array('line' => $lineNumber, 'content' => $line);
+				$lineNumber ++;
+			}
+		}
+
+        return $blames;
+    }
+
+    /**
+     * Diff file.
+     * 
+     * @param  string $path 
+     * @param  string $fromRevision 
+     * @param  string $toRevision 
+     * @access public
+     * @return array
+     */
+    public function diff($path, $fromRevision, $toRevision)
+    {
+        if(!scm::checkRevision($fromRevision)) return array();
+        if(!scm::checkRevision($toRevision))   return array();
+        
+        $api     = "compare";
+        $params  = array('from' => $fromRevision, 'to' => $toRevision, 'straight' => 1);
+        $results = $this->fetch($api, $params);
+        foreach($results->diffs as $key => $diff)
+        {
+            if($path != '' and strpos($diff->new_path, $path) === false) unset($results->diffs[$key]);
+        }
+        return $results->diffs;
+    }
+
+    /**
+     * Cat file.
+     * 
+     * @param  string $entry 
+     * @param  string $revision 
+     * @access public
+     * @return string
+     */
+    public function cat($entry, $revision = 'HEAD')
+    {
+        if(!scm::checkRevision($revision)) return false;
+        $file = $this->files($entry, $revision);
+        return base64_decode($file->content);
+    }
+
+    /**
+     * Get info.
+     * 
+     * @param  string $entry 
+     * @param  string $revision 
+     * @access public
+     * @return object
+     */
+    public function info($entry, $revision = 'HEAD')
+    {
+        if(!scm::checkRevision($revision)) return false;
+
+        $info = new stdclass();
+        $info->kind = 'dir';
+        $info->path = $entry; 
+        $info->root = '';
+
+        if($entry)
+        {
+            $parent = dirname($entry);
+            if($parent == '.') $parent = '/';
+            if($parent == '')  $parent = '/';
+            $list = $this->tree($parent, 0);
+
+            foreach($list as $node) if($node->path == $entry) $file = $node;
+
+            $commits = $this->getCommitsByPath($entry);
+
+            if(!empty($commits)) $file->revision = zget($commits[0], 'id', '');
+            $info->kind = $file->type == 'tree' ? 'dir' : 'file';
+        }
+
+        return $info;
+    }
+
+    /**
+     * Exec git cmd.
+     * 
+     * @param  string $cmd 
+     * @access public
+     * @todo Exec commads by gitlab api.
+     * @return array
+     */
+    public function exec($cmd)
+    {
+        chdir($this->root);
+        return execCmd(escapeCmd("$this->client $cmd"), 'array');
+    }
+
+    /**
+     * Parse diff.
+     * 
+     * @param  array $lines 
+     * @access public
+     * @return array
+     */
+    public function parseDiff($results)
+    {
+        if(empty($results)) return array();
+        foreach($results as $file)
+        {
+			$diffFile = new stdclass();
+			$diffFile->fileName = $file->new_path;
+
+            $diff = new stdclass;
+            $diff->fileName = $file->new_path;
+
+            preg_match('/^@@ -(\\d+)(,(\\d+))?\\s+\\+(\\d+)(,(\\d+))?\\s+@@/A', $file->diff, $matches);
+            if(empty($matches)) continue;
+
+            $diff->oldStartLine = $matches[1];
+            $diff->newStartLine = $matches[4];
+
+            $oldCurrentLine = $diff->oldStartLine;
+            $newCurrentLine = $diff->newStartLine;
+            if($file->new_file)
+            {   
+                $oldCurrentLine = $diff->newStartLine;
+                $newCurrentLine = $diff->oldStartLine;
+            }
+
+            $lines = explode("\n", $file->diff);
+			$newLines = array();
+            foreach($lines as $line)
+            {
+				if(strpos($line, '@@') === 0) continue;
+				if(strpos($line, '\ No newline at end of file') === 0) continue;
+				$sign = empty($line) ? '' : $line[0];
+				if($sign == '-' and $file->new_file) $sign = '+';
+				$type = $sign != '-' ? $sign == '+' ? 'new' : 'all' : 'old';
+
+				if($sign == '+' or $sign == '-')
+				{
+					$line = substr_replace($line, ' ', 1, 0);
+					if($file->new_file) $line = preg_replace('/^\-/', '+', $line);
+                }
+
+				$newLine = new stdclass();
+				$newLine->type  = $type;
+				$newLine->oldlc = $type != 'new' ? $oldCurrentLine : '';
+				$newLine->newlc = $type != 'old' ? $newCurrentLine : '';
+				$newLine->line  = htmlspecialchars($line);
+
+				if($type != 'new') $oldCurrentLine++;
+				if($type != 'old') $newCurrentLine++;
+
+				$newLines[] = $newLine;
+            }
+            $diffFile->contents[] = $diff;
+            $diff->lines = $newLines;
+			$diffs[] = $diffFile;
+        }
+        return $diffs;
+    }
+
+    /**
+     * Get commit count.
+     * 
+     * @param  int    $commits 
+     * @param  string $lastVersion 
+     * @access public
+     * @return int
+     */
+    public function getCommitCount($commits = 0, $lastVersion = '')
+    {
+        if(!scm::checkRevision($lastVersion)) return false;
+
+        chdir($this->root);
+        $revision = $this->branch ? $this->branch : 'HEAD';
+        return execCmd(escapeCmd("$this->client rev-list --count $revision -- ./"), 'string');
+    }
+
+    /**
+     * Get first revision.
+     * 
+     * @access public
+     * @return string
+     */
+    public function getFirstRevision()
+    {
+        chdir($this->root);
+        $list = execCmd(escapeCmd("$this->client rev-list --reverse HEAD -- ./"), 'array');
+        return $list[0];
+    }
+
+    /**
+     * Get latest revision 
+     * 
+     * @access public
+     * @return string
+     */
+    public function getLatestRevision()
+    {
+        chdir($this->root);
+        $revision = $this->branch ? $this->branch : 'HEAD';
+        $list     = execCmd(escapeCmd("$this->client rev-list -1 $revision -- ./"), 'array');
+        return $list[0];
+    }
+
+    /**
+     * Get commits.
+     * 
+     * @param  string $version 
+     * @param  int    $count 
+     * @param  string $branch 
+     * @access public
+     * @return array
+     */
+    public function getCommits($version = '', $count = 0, $branch = '')
+    {
+        if(!scm::checkRevision($version)) return array();
+        $api = "commits";
+	
+        $count = 500;
+        $params = array();
+        $params['ref_name'] = $branch;
+        $params['per_page'] = $count;
+        $params['all']      = 1;
+
+		if($version)
+		{
+			$lastCommit = $this->getSingleCommit($version);
+			$params['until'] = $lastCommit->committed_date;
+		}
+
+        $list = $this->fetch($api, $params);
+
+        $commits = array();
+        foreach($list as $commit)
+        {
+            $log = new stdclass;
+            $log->committer = $commit->committer_name;
+            $log->revision  = $commit->id;
+            $log->comment   = $commit->message;
+            $log->time      = date('Y-m-d H:i:s', strtotime($commit->created_at));
+            
+            $commits[$commit->id] = $log;
+            $files[$commit->id]   = $this->getFilesByCommit($log->revision);                          
+        }
+
+        return array('commits' => $commits, 'files' => $files);
+    }
+
+	/**
+	 * getCommit 
+	 * 
+	 * @param  int    $sha 
+	 * @access public
+	 * @return void
+	 */
+	public function getSingleCommit($sha)
+	{
+        if(!scm::checkRevision($sha)) return null;
+        $api = "commits/$sha";
+		return $this->fetch($api);
+	}
+
+	/**
+	 * Get commits by path.
+	 * 
+	 * @param  string    $path 
+	 * @access public
+	 * @return array
+	 */
+	public function getCommitsByPath($path, $fromRevision = '', $toRevision = '')
+	{
+        $path = ltrim($path, DIRECTORY_SEPARATOR);
+		$api = "commits";
+
+		$param = new stdclass();  
+		$param->path     = urldecode($path);
+        $param->ref_name = $this->branch;
+
+        if($fromRevision) $fromRevision = $this->getSingleCommit($fromRevision);
+        if($toRevision)   $toRevision   = $this->getSingleCommit($toRevision);
+
+        if(!$fromRevision) $since = '';
+        if(!$toRevision)   $until = '';
+        if($fromRevision and $toRevision)
+        {
+            $since = min($fromRevision->committed_date, $toRevision->committed_date);
+            $until = max($fromRevision->committed_date, $toRevision->committed_date);
+        }
+
+        $param->since = $since;
+        $param->until = $until;
+
+		return $this->fetch($api, $param);
+	}
+
+    /**
+     * Get files by commit.
+     * 
+     * @param  string    $commit 
+     * @access public
+     * @return void
+     */
+    public function getFilesByCommit($revision)
+    {
+        if(!scm::checkRevision($revision)) return array();
+        $api  = "commits/{$revision}/diff";
+        $params = new stdclass;
+        $params->page     = 1;
+        $params->per_page = 200;
+
+        $allResults = array();
+        while($results = $this->fetch($api, $params))
+        {
+            $params->page ++;
+            $allResults = $allResults + $results;
+        }
+
+        $files = array();
+        foreach($allResults as $row)
+        {
+            $file = new stdclass();
+            $file->revision = $revision;
+            $file->path     = '/' . $row->new_path;
+            $file->type     = 'file';
+    
+            $file->action   = 'M';
+            if($row->new_file) $file->action = 'A';
+            if($row->renamed_file) $file->action = 'R';
+            if($row->deleted_file) $file->action = 'D';
+            $files[] = $file;
+        }
+
+        return $files;
+    }
+
+    /**
+     * Repository/tree api.
+     * 
+     * @param  string    $path 
+     * @param  bool      $recursive 
+     * @access public
+     * @return void
+     */
+    public function tree($path, $recursive = 1)
+    {
+        $api = "tree";
+
+        $params = array();
+        $params['path']      = ltrim($path, '/');
+        $params['ref']       = $this->branch;
+        $params['recursive'] = (int) $recursive;
+        return $this->fetch($api, $params);
+    }
+
+    /**
+     * Fetch data from gitlab api.
+     * 
+     * @param  string    $api 
+     * @access public
+     * @return void
+     */
+    public function fetch($api, $params = array())
+    {
+        $params = (array) $params;
+        $params['private_token'] = $this->token;
+
+		$api = ltrim($api, '/');
+        $api = $this->root . $api . '?' . http_build_query($params);
+
+        $response = file_get_contents($api);
+        return json_decode($response);
+    }
+
+    /**
+     * Format bytes shown.
+     * 
+     * @param  int    $size 
+     * @static
+     * @access public
+     * @return string
+     */
+    public static function formatBytes($size)
+    {   
+		if($size < 1024) return $size . 'Bytes';
+        if(round($size / (1024 * 1024), 2) > 1) return round($size / (1024 * 1024), 2) . 'G';
+		if(round($size / 1024, 2) > 1) return round($size / 1024, 2) . 'M';
+		return round($size, 2) . 'KB';
+    }  
+
+    /**
+     * Parse log.
+     * 
+     * @param  array  $logs 
+     * @access public
+     * @return array
+     */
+    public function parseLog($logs)
+    {
+        $parsedLogs = array();
+        $i          = 0;
+        foreach($logs as $commit)
+        {
+            $parsedLog = new stdclass();
+            $parsedLog->revision  = $commit->id;
+            $parsedLog->committer = $commit->committer_name;
+            $parsedLog->time      = date('Y-m-d H:i:s', strtotime($commit->committed_date));
+            $parsedLog->comment   = $commit->message;
+            $parsedLog->change    = array();
+            foreach($commit->diffs as $diff)
+            {
+                $parsedLog->change[$diff->path] = array();
+                $parsedLog->change[$diff->path]['action'] = $diff->action;
+                $parsedLog->change[$diff->path]['kind']   = $diff->type;
+            }
+            $parsedLogs[] = $parsedLog;
+        }
+
+        return $parsedLogs;
+    }
+}
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 109c822529..f077c8ff35 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -431,7 +431,6 @@ $lang->action->dynamicAction->entry['created'] = '添加应用';
 $lang->action->dynamicAction->entry['edited']  = '编辑应用';
 
 /* 用来生成相应对象的链接。*/
-global $config;
 $lang->action->label->product     = $lang->productCommon . '|product|view|productID=%s';
 $lang->action->label->productplan = "计划|productplan|view|productID=%s";
 $lang->action->label->release     = '发布|release|view|productID=%s';
diff --git a/module/admin/view/checkweak.html.php b/module/admin/view/checkweak.html.php
index 1f3b5ff786..bfe6962ddc 100644
--- a/module/admin/view/checkweak.html.php
+++ b/module/admin/view/checkweak.html.php
@@ -11,11 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<div id='mainMenu' class='clearfix'>
-  <div class='btn-toolbar pull-left'>
-    <div class='btn-toolbar pull-left'><?php //common::printAdminSubMenu('system');?></div>
-  </div>
-</div>
 <div class="main-row">
   <div class='side-col' id='sidebar'>
     <div class='cell'>
diff --git a/module/admin/view/sso.html.php b/module/admin/view/sso.html.php
index e62d812ded..5be91c71b6 100644
--- a/module/admin/view/sso.html.php
+++ b/module/admin/view/sso.html.php
@@ -11,9 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.html.php'; ?>
-<div id="mainMenu" class="clearfix">
-  <div class="btn-toolbar pull-left"><?php //common::printAdminSubMenu('sso');?></div>
-</div>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
diff --git a/module/automation/control.php b/module/automation/control.php
index 841cc4fad4..8c7ad1eedf 100644
--- a/module/automation/control.php
+++ b/module/automation/control.php
@@ -11,14 +11,6 @@
  */
 class automation extends control
 {
-    /** 
-     * Project id.
-     *
-     * @var    int
-     * @access public
-     */
-    public $projectID = 0;
-
     /** 
      * Products.
      *
diff --git a/module/block/control.php b/module/block/control.php
index e0ae443afc..0b92e36133 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -975,34 +975,6 @@ class block extends control
             $plans[$product] = $plan;
         }
 
-        /* Get projects. */
-        $projects = $this->dao->select('t1.product, t2.status, t2.end')->from(TABLE_PROJECTPRODUCT)->alias('t1')
-            ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
-            ->where('t1.product')->in($productIdList)
-            ->andWhere('t2.deleted')->eq(0)
-            ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->sprints)->fi()
-            ->fetchGroup('product');
-        foreach($projects as $product => $productProjects)
-        {
-            $undone= 0;
-            $done  = 0;
-            $delay = 0;
-
-            foreach($productProjects as $project)
-            {
-                ($project->status == 'done' or $project->status == 'closed') ? $done++ : $undone++;
-                if($project->status != 'done' && $project->status != 'closed' && $project->status != 'suspended' && $project->end < helper::today()) $delay++;
-            }
-
-            $project = array();
-            $project['undone'] = $undone;
-            $project['done']   = $done;
-            $project['delay']  = $delay;
-            $project['all']    = count($productProjects);
-
-            $projects[$product] = $project;
-        }
-
         /* Get releases. */
         $releases = $this->dao->select('product, status, COUNT(*) AS count')->from(TABLE_RELEASE)
             ->where('deleted')->eq(0)
@@ -1028,14 +1000,12 @@ class block extends control
         {
             $product->stories     = isset($stories[$productID])      ? $stories[$productID]      : 0;
             $product->plans       = isset($plans[$productID])        ? $plans[$productID]        : 0;
-            $product->projects    = isset($projects[$productID])     ? $projects[$productID]     : 0;
             $product->releases    = isset($releases[$productID])     ? $releases[$productID]     : 0;
             $product->lastRelease = isset($lastReleases[$productID]) ? $lastReleases[$productID] : 0;
         }
 
         $this->app->loadLang('story');
         $this->app->loadLang('productplan');
-        $this->app->loadLang('project');
         $this->app->loadLang('release');
 
         $this->view->products = $products;
diff --git a/module/block/js/admin.js b/module/block/js/admin.js
index 6199a79d67..9586844079 100644
--- a/module/block/js/admin.js
+++ b/module/block/js/admin.js
@@ -11,7 +11,6 @@ $(function()
 
         if($blocksList.find('#moduleBlock').val() == 'scrumtest' && $('#paramstype').val() != 'all')
         {
-            console.log($('#paramstype').val());
             $titleInput.val(value);
         }
         else
@@ -19,8 +18,6 @@ $(function()
             var lang = config.clientLang;
             if(lang.indexOf('zh') >= 0)
             {
-                console.log(preValue, blockTitle);
-                console.log(blockTitle.indexOf(preValue));
                 if(blockTitle.indexOf(preValue) >= 0)
                 {
                     blockTitle = blockTitle.replace(preValue, value);
diff --git a/module/block/lang/de.php b/module/block/lang/de.php
index 2d4307671a..ea422bf89b 100644
--- a/module/block/lang/de.php
+++ b/module/block/lang/de.php
@@ -355,7 +355,6 @@ $lang->block->availableBlocks->testtask  = 'Testaufgaben';
 $lang->block->availableBlocks->risk      = 'My Risks';
 $lang->block->availableBlocks->issue     = 'My Issues';
 
-global $config;
 if($config->systemMode == 'new') $lang->block->moduleList['project'] = 'Project';
 $lang->block->moduleList['product']   = $lang->productCommon;
 $lang->block->moduleList['execution'] = $lang->execution->common;
diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index fd92c396d1..8987fdba98 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -355,7 +355,6 @@ $lang->block->availableBlocks->testtask  = 'Requests';
 $lang->block->availableBlocks->risk      = 'My Risks';
 $lang->block->availableBlocks->issue     = 'My Issues';
 
-global $config;
 if($config->systemMode == 'new') $lang->block->moduleList['project'] = 'Project';
 $lang->block->moduleList['product']   = $lang->productCommon;
 $lang->block->moduleList['execution'] = $lang->execution->common;
diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php
index 0b2043849d..ac152d4c1a 100644
--- a/module/block/lang/fr.php
+++ b/module/block/lang/fr.php
@@ -355,7 +355,6 @@ $lang->block->availableBlocks->testtask  = 'Recettes';
 $lang->block->availableBlocks->risk      = 'My Risks';
 $lang->block->availableBlocks->issue     = 'My Issues';
 
-global $config;
 if($config->systemMode == 'new') $lang->block->moduleList['project'] = 'Project';
 $lang->block->moduleList['product']   = $lang->productCommon;
 $lang->block->moduleList['execution'] = $lang->execution->common;
diff --git a/module/block/lang/vi.php b/module/block/lang/vi.php
index 2b82f707ab..cdb7db9880 100644
--- a/module/block/lang/vi.php
+++ b/module/block/lang/vi.php
@@ -355,7 +355,6 @@ $lang->block->availableBlocks->testtask  = 'Yêu cầu';
 $lang->block->availableBlocks->risk      = 'My Risks';
 $lang->block->availableBlocks->issue     = 'My Issues';
 
-global $config;
 if($config->systemMode == 'new') $lang->block->moduleList['project'] = 'Project';
 $lang->block->moduleList['product']   = $lang->productCommon;
 $lang->block->moduleList['execution'] = $lang->execution->common;
diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index f6312957b6..735f418623 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -291,11 +291,11 @@ $lang->block->default['full']['my']['3']['params']['count'] = '20';
 
 if($config->systemMode == 'new')
 {
-$lang->block->default['full']['my']['4']['title']           = '项目统计';
-$lang->block->default['full']['my']['4']['block']           = 'statistic';
-$lang->block->default['full']['my']['4']['source']          = 'project';
-$lang->block->default['full']['my']['4']['grid']            = 8;
-$lang->block->default['full']['my']['4']['params']['count'] = '20';
+    $lang->block->default['full']['my']['4']['title']           = '项目统计';
+    $lang->block->default['full']['my']['4']['block']           = 'statistic';
+    $lang->block->default['full']['my']['4']['source']          = 'project';
+    $lang->block->default['full']['my']['4']['grid']            = 8;
+    $lang->block->default['full']['my']['4']['params']['count'] = '20';
 }
 
 $lang->block->default['full']['my']['5']['title']  = '我的贡献';
@@ -355,7 +355,6 @@ $lang->block->availableBlocks->testtask  = '测试版本列表';
 $lang->block->availableBlocks->risk      = '我的风险';
 $lang->block->availableBlocks->issue     = '我的问题';
 
-global $config;
 if($config->systemMode == 'new') $lang->block->moduleList['project'] = '项目';
 $lang->block->moduleList['product']   = $lang->productCommon;
 $lang->block->moduleList['execution'] = $lang->execution->common;
diff --git a/module/block/view/productstatisticblock.html.php b/module/block/view/productstatisticblock.html.php
index a18907cc85..40f7d58547 100644
--- a/module/block/view/productstatisticblock.html.php
+++ b/module/block/view/productstatisticblock.html.php
@@ -175,10 +175,6 @@ $(function()
                 </div>
               </div>
             </div>
-            <?php $totalProject  = $product->projects ? zget($product->projects, 'all', 0) : 0;?>
-            <?php $undoneProject = $product->projects ? zget($product->projects, 'undone', 0) : 0;?>
-            <?php $delayProject  = $product->projects ? zget($product->projects, 'delay', 0) : 0;?>
-            <?php $undoneRate    = $totalProject ? round($undoneProject / $totalProject * 100, 2) : 0;?>
             <div class="product-info">
               <?php $totalRelease  = $product->releases ? array_sum($product->releases) : 0;?>
               <?php $normalRelease = $product->releases ? zget($product->releases, 'normal', 0) : 0;?>
diff --git a/module/bug/control.php b/module/bug/control.php
index 2042419b62..f973801bea 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -509,7 +509,7 @@ class bug extends control
         if(empty($moduleOptionMenu)) die(js::locate(helper::createLink('tree', 'browse', "productID=$productID&view=story")));
 
         /* Get products and projects. */
-        $products = $this->products;
+        $products = $this->config->CRProduct ? $this->products : $this->product->getPairs('noclosed');
         $projects = array(0 => '');
         if($projectID)
         {
@@ -817,6 +817,11 @@ class bug extends control
             if($bug->type != $type) unset($this->lang->bug->typeList[$type]);
         }
 
+        if($this->app->openApp == 'qa')
+        {
+            $this->view->products = $this->config->CRProduct ? $this->products : $this->product->getPairs('noclosed');
+        }
+
         /* Set header and position. */
         $this->view->title      = $this->lang->bug->edit . "BUG #$bug->id $bug->title - " . $this->products[$productID];
         $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
diff --git a/module/repo/config.php b/module/repo/config.php
index a86e7d8727..ebb573a0fe 100644
--- a/module/repo/config.php
+++ b/module/repo/config.php
@@ -42,6 +42,10 @@ $config->repo->edit->requiredFields = 'product,SCM,name,path,encoding,client';
 $config->repo->svn = new stdclass();
 $config->repo->svn->requiredFields = 'account,password';
 
+$config->repo->gitlab = new stdclass;
+$config->repo->gitlab->perPage = 300;
+$config->repo->gitlab->apiPath = "%s/api/v4/projects/%s/repository/";
+
 $config->repo->rules['module']['task']     = 'Task';
 $config->repo->rules['module']['bug']      = 'Bug';
 $config->repo->rules['module']['story']    = 'Story';
diff --git a/module/repo/control.php b/module/repo/control.php
index f7c15419c3..48b0d42ab1 100644
--- a/module/repo/control.php
+++ b/module/repo/control.php
@@ -165,6 +165,14 @@ class repo extends control
 
         $this->app->loadLang('action');
 
+        if($repo->SCM == 'Gitlab')
+        {
+            $projects = $this->repo->getGitlabProjects($repo->client, $repo->password);
+            $options  = array();
+            foreach($projects as $project) $options[$project->id] = $project->name . ':' . $project->http_url_to_repo;
+            $this->view->projects = $options;
+        }
+
         $repo->repoType       = $repo->id . '-' . $repo->SCM;
         $this->view->repo     = $repo;
         $this->view->repoID   = $repoID;
@@ -1072,6 +1080,29 @@ class repo extends control
         die($reposHtml);
     }
 
+	/**
+	 * Ajax get gitlab projects.
+	 *
+	 * @param  string    $host
+	 * @param  string    $token
+	 * @access public
+	 * @return void
+	 */
+	public function ajaxGetGitlabProjects($host, $token)
+	{
+		$host  = helper::safe64Decode($host);
+        $projects = $this->repo->getGitlabProjects($host, $token);
+
+		if(!$projects) $this->send(array('message' => array()));
+
+		$options = '';
+		foreach($projects as $project)
+		{
+			$options .= "<option value='{$project->id}' data-name='{$project->name}'>{$project->name}:{$project->http_url_to_repo}</option>";
+		}
+		die($options);
+	}
+
     /**
      * Ajax get branch drop menu.
      *
diff --git a/module/repo/js/create.js b/module/repo/js/create.js
index 96fbc55790..0af0d52404 100644
--- a/module/repo/js/create.js
+++ b/module/repo/js/create.js
@@ -6,16 +6,38 @@ $(function()
         $form = $(this).closest('form');
         $form.css('min-height', $form.height());
     })
+    
+    $('#gitlabHost, #gitlabToken').change(function()
+    {
+        host  = Base64.encode($('#gitlabHost').val());
+        token = $('#gitlabToken').val();
+        url   = createLink('repo', 'ajaxgetgitlabprojects', "host=" + host + '&token=' + token);
+        if(host == '' || token == '') return false;
+
+        $.get(url, function(response)
+        {
+            $('#gitlabProject').html('').append(response);
+            $('#gitlabProject').chosen().trigger("chosen:updated");;
+        });
+    });
+    
+    $('#gitlabProject').change(function()
+    {
+        $option = $(this).find('option:selected');
+        $('#name').val($option.data('name'));
+    });
+    
 });
 
-function scmChanged(scm) {
+function scmChanged(scm)
+{
     if(scm == 'Git')
     {
         $('.account-fields').addClass('hidden');
 
         $('.tips-git').removeClass('hidden');
         $('.tips-svn').addClass('hidden');
-    }
+    } 
     else
     {
         $('.account-fields').removeClass('hidden');
@@ -23,4 +45,7 @@ function scmChanged(scm) {
         $('.tips-git').addClass('hidden');
         $('.tips-svn').removeClass('hidden');
     }
+
+    $('tr.gitlab').toggle(scm == 'Gitlab');
+    $('tr.hide-gitlab').toggle(scm != 'Gitlab');
 }
diff --git a/module/repo/js/edit.js b/module/repo/js/edit.js
index 96fbc55790..cc79cbb2a5 100644
--- a/module/repo/js/edit.js
+++ b/module/repo/js/edit.js
@@ -6,9 +6,33 @@ $(function()
         $form = $(this).closest('form');
         $form.css('min-height', $form.height());
     })
+
+    $('#gitlabHost, #gitlabToken').change(function()
+    {
+        host  = Base64.encode($('#gitlabHost').val());
+        token = $('#gitlabToken').val();
+        url   = createLink('repo', 'ajaxgetgitlabprojects', "host=" + host + '&token=' + token);
+        if(host == '' || token == '') return false;
+
+        $.get(url, function(response)
+        {
+            $('#gitlabProject').html('').append(response);
+            $('#gitlabProject').chosen().trigger("chosen:updated");;
+        });
+    });
+    
+    $('#gitlabProject').change(function()
+    {
+        $option = $(this).find('option:selected');
+        if(!$option.data('name')) return false;
+        $('#name').val($option.data('name'));
+        $(this).chosen().trigger("chosen:updated");
+    });
+   
 });
 
-function scmChanged(scm) {
+function scmChanged(scm)
+{
     if(scm == 'Git')
     {
         $('.account-fields').addClass('hidden');
@@ -23,4 +47,7 @@ function scmChanged(scm) {
         $('.tips-git').addClass('hidden');
         $('.tips-svn').removeClass('hidden');
     }
+
+    $('tr.gitlab').toggle(scm == 'Gitlab');
+    $('tr.hide-gitlab').toggle(scm != 'Gitlab');
 }
diff --git a/module/repo/lang/en.php b/module/repo/lang/en.php
index a724d83b23..eee7437991 100644
--- a/module/repo/lang/en.php
+++ b/module/repo/lang/en.php
@@ -124,6 +124,14 @@ $lang->repo->encodingList['gbk']   = 'GBK';
 
 $lang->repo->scmList['Git']        = 'Git';
 $lang->repo->scmList['Subversion'] = 'SVN';
+$lang->repo->scmList['Gitlab']     = 'Gitlab';
+
+$lang->repo->gitlabHost    = 'Gitlab Host';
+$lang->repo->gitlabToken   = 'Gitlab Token';
+$lang->repo->gitlabProject = 'Projects';
+
+$lang->repo->placeholder = new stdclass;
+$lang->repo->placeholder->gitlabHost = 'Input url of gitlab';
 
 $lang->repo->notice                 = new stdclass();
 $lang->repo->notice->syncing        = 'Synchronizing. Please wait ...';
diff --git a/module/repo/lang/zh-cn.php b/module/repo/lang/zh-cn.php
index eba6fe4af5..0eb819a7ce 100644
--- a/module/repo/lang/zh-cn.php
+++ b/module/repo/lang/zh-cn.php
@@ -124,6 +124,14 @@ $lang->repo->encodingList['gbk']   = 'GBK';
 
 $lang->repo->scmList['Git']        = 'Git';
 $lang->repo->scmList['Subversion'] = 'Subversion';
+$lang->repo->scmList['Gitlab']     = 'Gitlab';
+
+$lang->repo->gitlabHost    = 'Gitlab 地址';
+$lang->repo->gitlabToken   = 'Gitlab Token';
+$lang->repo->gitlabProject = '项目';
+
+$lang->repo->placeholder = new stdclass;
+$lang->repo->placeholder->gitlabHost = '请填写gitlab访问地址';
 
 $lang->repo->notice                 = new stdclass();
 $lang->repo->notice->syncing        = '正在同步中, 请稍等...';
diff --git a/module/repo/model.php b/module/repo/model.php
index 41ebe4f62d..22a9393a43 100644
--- a/module/repo/model.php
+++ b/module/repo/model.php
@@ -235,11 +235,21 @@ class repoModel extends model
         if(!$this->checkConnection()) return false;
 
         $data = fixer::input('post')
+            ->setIf($this->post->SCM == 'Gitlab', 'password', $this->post->gitlabToken)
+            ->setIf($this->post->SCM == 'Gitlab', 'client', $this->post->gitlabHost)
             ->skipSpecial('path,client,account,password')
             ->setDefault('product', '')
             ->join('product', ',')
             ->get();
 
+        if($this->post->SCM == 'Gitlab')
+        {
+            $data->path = sprintf($this->config->repo->gitlab->apiPath, $data->gitlabHost, $this->post->gitlabProject);
+
+            unset($data->gitlabHost);
+            unset($data->gitlabToken);
+        }
+
         $data->acl = empty($data->acl) ? '' : json_encode($data->acl);
 
         if($data->SCM == 'Subversion')
@@ -252,8 +262,9 @@ class repoModel extends model
         }
 
         if($data->encrypt == 'base64') $data->password = base64_encode($data->password);
-        $this->dao->insert(TABLE_REPO)->data($data)
+        $this->dao->insert(TABLE_REPO)->data($data, $skip = 'gitlabProject')
             ->batchCheck($this->config->repo->create->requiredFields, 'notempty')
+            ->checkIF($data->SCM == 'GitLab', 'gitlabProject', 'notempty')
             ->checkIF($data->SCM == 'Subversion', $this->config->repo->svn->requiredFields, 'notempty')
             ->autoCheck()
             ->exec();
@@ -282,6 +293,16 @@ class repoModel extends model
             ->skipSpecial('path,client,account,password')
             ->join('product', ',')
             ->get();
+
+        if($this->post->SCM == 'Gitlab')
+        {
+            $data->path = sprintf($this->config->repo->gitlab->apiPath, $data->gitlabHost, $this->post->gitlabProject);
+
+            unset($data->gitlabHost);
+            unset($data->gitlabToken);
+            unset($data->gitlabProject);
+        }
+
         $data->acl = empty($data->acl) ? '' : json_encode($data->acl);
 
         if($data->SCM == 'Subversion' and $data->path != $repo->path)
@@ -301,9 +322,10 @@ class repoModel extends model
         if(!$this->checkConnection()) return false;
 
         if($data->encrypt == 'base64') $data->password = base64_encode($data->password);
-        $this->dao->update(TABLE_REPO)->data($data)
+        $this->dao->update(TABLE_REPO)->data($data, $skip = 'gitlabProject')
             ->batchCheck($this->config->repo->edit->requiredFields, 'notempty')
             ->checkIF($data->SCM == 'Subversion', $this->config->repo->svn->requiredFields, 'notempty')
+            ->checkIF($data->SCM == 'GitLab', 'gitlabProject', 'notempty')
             ->autoCheck()
             ->where('id')->eq($id)->exec();
 
@@ -1754,4 +1776,21 @@ class repoModel extends model
 
         return $buildedURL;
     }
+
+   /**
+     * Get gitlab projects.
+     *
+     * @param  string   $host
+     * @param  string   $token
+     * @access public
+     * @return array
+     */
+    public function getGitlabProjects($host, $token)
+    {
+		$host  = rtrim($host, '/');
+		$host .= '/api/v4/projects';
+
+		$projects = file_get_contents($host . "?private_token=$token");
+		return json_decode($projects);
+    }
 }
diff --git a/module/repo/view/create.html.php b/module/repo/view/create.html.php
index b547e7e1fd..6af99a7663 100644
--- a/module/repo/view/create.html.php
+++ b/module/repo/view/create.html.php
@@ -10,6 +10,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
+<?php js::import($jsRoot . 'misc/base64.js');?>
 <?php if(common::checkNotCN()):?>
 <style>.user-addon {padding-right: 16px; padding-left: 16px;}</style>
 <?php endif;?>
@@ -31,12 +32,24 @@
             <td style="width:550px"><?php echo html::select('SCM', $lang->repo->scmList, 'Git', "onchange='scmChanged(this.value)' class='form-control'"); ?></td>
             <td class="tips-git"><?php echo $lang->repo->syncTips; ?></td>
           </tr>
+          <tr class='gitlab hide'>
+            <th><?php echo $lang->repo->gitlabHost;?></th>
+            <td><?php echo html::input('gitlabHost', '', "class='form-control' placeholder='{$lang->repo->placeholder}'");?>
+          </tr>
+          <tr class='gitlab hide'>
+            <th><?php echo $lang->repo->gitlabToken;?></th>
+            <td><?php echo html::input('gitlabToken', '', "class='form-control'");?>
+          </tr>
+          <tr class='gitlab hide'>
+            <th><?php echo $lang->repo->gitlabProject;?></th>
+            <td><?php echo html::select('gitlabProject', array(''), '', "class='form-control chosen'");?>
+          </tr>
           <tr>
             <th><?php echo $lang->repo->name; ?></th>
             <td class='required'><?php echo html::input('name', '', "class='form-control'"); ?></td>
             <td></td>
           </tr>
-          <tr>
+          <tr class='hide-gitlab'>
             <th><?php echo $lang->repo->path; ?></th>
             <td class='required'><?php echo html::input('path', '', "class='form-control'"); ?></td>
             <td class='muted'>
@@ -49,7 +62,7 @@
             <td class='required'><?php echo html::input('encoding', 'utf-8', "class='form-control'"); ?></td>
             <td class='muted'><?php echo $lang->repo->encodingsTips; ?></td>
           </tr>
-          <tr>
+          <tr class='hide-gitlab'>
             <th><?php echo $lang->repo->client;?></th>
             <td class='required'><?php echo html::input('client', '', "class='form-control'")?></td>
             <td class='muted'>
@@ -57,11 +70,11 @@
                 <span class="tips-svn"><?php echo $lang->repo->example->client->svn;?></span>
             </td>
           </tr>
-          <tr class="account-fields">
+          <tr class="account-fields hide-gitlab">
             <th><?php echo $lang->repo->account;?></th>
             <td><?php echo html::input('account', '', "class='form-control'");?></td>
           </tr>
-          <tr class="account-fields">
+          <tr class="account-fields hide-gitlab">
             <th><?php echo $lang->repo->password;?></th>
             <td>
               <div class='input-group'>
diff --git a/module/repo/view/edit.html.php b/module/repo/view/edit.html.php
index 914b0715ca..823e7dfd13 100644
--- a/module/repo/view/edit.html.php
+++ b/module/repo/view/edit.html.php
@@ -12,6 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
+<?php js::import($jsRoot . 'misc/base64.js');?>
 <?php if(common::checkNotCN()):?>
 <style>
 .user-addon{padding-right: 16px; padding-left: 16px;}
@@ -37,12 +38,24 @@
                 <span class="tips-git"><?php echo $lang->repo->syncTips; ?></span>
             </td>
           </tr>
+          <tr class='gitlab hide'>
+            <th><?php echo $lang->repo->gitlabHost;?></th>
+            <td><?php echo html::input('gitlabHost', $repo->client, "class='form-control' placeholder='{$lang->repo->placeholder}'");?>
+          </tr>
+          <tr class='gitlab hide'>
+            <th><?php echo $lang->repo->gitlabToken;?></th>
+            <td><?php echo html::input('gitlabToken', $repo->password, "class='form-control'");?>
+          </tr>
+          <tr class='gitlab hide'>
+            <th><?php echo $lang->repo->gitlabProject;?></th>
+            <td><?php echo html::select('gitlabProject', $projects, '', "class='form-control chosen'");?>
+          </tr>
           <tr>
             <th><?php echo $lang->repo->name; ?></th>
             <td class='required'><?php echo html::input('name', $repo->name, "class='form-control'"); ?></td>
             <td></td>
           </tr>
-          <tr>
+          <tr class='hide-gitlab'>
             <th><?php echo $lang->repo->path; ?></th>
             <td class='required'><?php echo html::input('path', $repo->path, "class='form-control'"); ?></td>
             <td class='muted'>
@@ -55,7 +68,7 @@
             <td class='required'><?php echo html::input('encoding', $repo->encoding, "class='form-control'"); ?></td>
             <td class='muted'><?php echo $lang->repo->encodingsTips; ?></td>
           </tr>
-          <tr>
+          <tr class='hide-gitlab'>
             <th><?php echo $lang->repo->client;?></th>
             <td class='required'><?php echo html::input('client',  $repo->client, "class='form-control'")?></td>
             <td class='muted'>
@@ -63,11 +76,11 @@
                 <span class="tips-svn"><?php echo $lang->repo->example->client->svn;?></span>
             </td>
           </tr>
-          <tr class="account-fields">
+          <tr class="account-fields hide-gitlab">
             <th><?php echo $lang->repo->account;?></th>
             <td><?php echo html::input('account', $repo->account, "class='form-control'");?></td>
           </tr>
-          <tr class="account-fields">
+          <tr class="account-fields  hide-gitlab">
             <th><?php echo $lang->repo->password;?></th>
             <td>
               <div class='input-group'>
diff --git a/module/task/js/create.js b/module/task/js/create.js
index 99177327f3..e955040ec2 100644
--- a/module/task/js/create.js
+++ b/module/task/js/create.js
@@ -335,7 +335,6 @@ function markTestStory()
             var $tr = $(this);
             storiesHasTest[$tr.find('select[name^="testStory"]').val()] = true;
         });
-        console.log(storiesHasTest);
         return storiesHasTest;
     };
 
diff --git a/module/testcase/config.php b/module/testcase/config.php
index 66397c6210..7d0d752ec8 100644
--- a/module/testcase/config.php
+++ b/module/testcase/config.php
@@ -160,7 +160,7 @@ $config->testcase->datatable->fieldList['lastRunResult']['required'] = 'no';
 
 $config->testcase->datatable->fieldList['status']['title']    = 'statusAB';
 $config->testcase->datatable->fieldList['status']['fixed']    = 'no';
-$config->testcase->datatable->fieldList['status']['width']    = '60';
+$config->testcase->datatable->fieldList['status']['width']    = '70';
 $config->testcase->datatable->fieldList['status']['required'] = 'no';
 
 $config->testcase->datatable->fieldList['lastEditedBy']['title']    = 'lastEditedBy';