diff --git a/server/app/scripts/app.js b/server/app/scripts/app.js
index 5334513c..263821c2 100644
--- a/server/app/scripts/app.js
+++ b/server/app/scripts/app.js
@@ -226,7 +226,7 @@ app.controller("AccountReposController", function($scope, $http, user) {
 });
 
 
-app.controller("CommitController", function($scope, $http, $routeParams, stdout, feed) {
+app.controller("CommitController", function($scope, $http, $route, $routeParams, stdout, feed) {
 
 	var remote = $routeParams.remote;
 	var owner  = $routeParams.owner;
@@ -234,12 +234,30 @@ app.controller("CommitController", function($scope, $http, $routeParams, stdout,
 	var branch = $routeParams.branch;
 	var commit = $routeParams.commit;
 	$scope.console='';
+	
+	var handleOutput = function(id, clearConsole) {
+		var lineFormatter = new Drone.LineFormatter();
+		var el = document.querySelector('#output');
+		if(clearConsole === true) {
+			el.innerHTML = ''; 
+		}
+		stdout.subscribe(id, function(out){
+			angular.element(el).append(lineFormatter.format(out));
+			if ($scope.following) {
+				window.scrollTo(0, document.body.scrollHeight);
+			}
+		});
+	}
 
 	feed.subscribe(function(item) {
 		if (item.commit.sha    == commit &&
 			item.commit.branch == branch) {
+			if(item.commit.status == "Started") {
+				handleOutput(item.commit.id, true);
+			}
 			$scope.commit = item.commit;
 			$scope.$apply();
+
 		} else {
 			// we trigger an toast notification so the
 			// user is aware another build started
@@ -274,14 +292,8 @@ app.controller("CommitController", function($scope, $http, $routeParams, stdout,
 				return;
 			}
 
-			var lineFormatter = new Drone.LineFormatter();
-			var el = document.querySelector('#output');
-			stdout.subscribe(data.id, function(out){
-				angular.element(el).append(lineFormatter.format(out));
-				if ($scope.following) {
-					window.scrollTo(0, document.body.scrollHeight);
-				}
-			});
+			handleOutput(data.id, false);
+		
 		}).
 		error(function(data, status, headers, config) {
 			console.log(data);
@@ -297,7 +309,7 @@ app.controller("CommitController", function($scope, $http, $routeParams, stdout,
 	}
 
 	$scope.rebuildCommit = function() {
-		$http({method: 'POST', url: '/api/repos/'+remote+'/'+owner+'/'+name+'/'+'branches/'+branch+'/'+'commits/'+commit+'?action=rebuild' })
+        $http({method: 'POST', url: '/api/repos/'+remote+'/'+owner+'/'+name+'/'+'branches/'+branch+'/'+'commits/'+commit+'?action=rebuild' });
 	}
 
 
diff --git a/server/app/views/commit.html b/server/app/views/commit.html
index 5b27deb0..6ca5465f 100644
--- a/server/app/views/commit.html
+++ b/server/app/views/commit.html
@@ -37,7 +37,7 @@
 <div id="main" class="output">
 	<div id="main" class="output" data-result="{{ commit.status }}">
 		<nav>
-			<div class="options ng-scope" ng-if="repo.role.admin || repo.role.write">
+			<div class="options ng-scope" ng-if="(repo.role.admin || repo.role.write) && (commit.status != 'Started' && commit.status != 'Pending')">
 				<a class="pure-button pure-button-primary" ng-click="rebuildCommit()" href="#">
 					<i class="fa fa-refresh"></i>
 					<span>Rebuild</span>
diff --git a/server/worker/docker/docker.go b/server/worker/docker/docker.go
index ad1f3bf5..d00f7752 100644
--- a/server/worker/docker/docker.go
+++ b/server/worker/docker/docker.go
@@ -68,7 +68,7 @@ func (d *Docker) Do(c context.Context, r *worker.Work) {
 	commitc := pubsub.Register(c, "_global")
 	commitc.Publish(r)
 	stdoutc := pubsub.RegisterOpts(c, r.Commit.ID, pubsub.ConsoleOpts)
-	defer stdoutc.Close()
+	defer pubsub.Unregister(c, r.Commit.ID)
 
 	// create a special buffer that will also
 	// write to a websocket channel
diff --git a/shared/build/repo/repo.go b/shared/build/repo/repo.go
index 0a5746ee..82973efa 100644
--- a/shared/build/repo/repo.go
+++ b/shared/build/repo/repo.go
@@ -50,6 +50,8 @@ func (r *Repo) IsRemote() bool {
 		return true
 	case strings.HasPrefix(r.Path, "git@"):
 		return true
+	case strings.HasPrefix(r.Path, "gitlab@"):
+		return true
 	case strings.HasPrefix(r.Path, "http://"):
 		return true
 	case strings.HasPrefix(r.Path, "https://"):
@@ -77,6 +79,10 @@ func (r *Repo) IsGit() bool {
 		return true
 	case strings.HasPrefix(r.Path, "ssh://git@"):
 		return true
+	case strings.HasPrefix(r.Path, "gitlab@"):
+		return true
+	case strings.HasPrefix(r.Path, "ssh://gitlab@"):
+		return true
 	case strings.HasPrefix(r.Path, "https://github"):
 		return true
 	case strings.HasPrefix(r.Path, "http://github"):