From 459759370fa73264a4adfa4b21282471ab775945 Mon Sep 17 00:00:00 2001
From: Kirill Zaitsev <kirik910@gmail.com>
Date: Mon, 27 Oct 2014 04:14:20 +0300
Subject: [PATCH 1/2] Show pull request link, when commit related with pull
 request

---
 server/app/views/commit.html           | 29 +++++-------------------
 server/app/views/commit_detail.html    | 23 +++++++++++++++++++
 server/app/views/commit_detail_pr.html | 31 ++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 23 deletions(-)
 create mode 100644 server/app/views/commit_detail.html
 create mode 100644 server/app/views/commit_detail_pr.html

diff --git a/server/app/views/commit.html b/server/app/views/commit.html
index fbdcc5258..1f398e6c0 100644
--- a/server/app/views/commit.html
+++ b/server/app/views/commit.html
@@ -11,29 +11,12 @@
 			<dd><h1>{{ commit.duration | toDuration}}</h1></dd>
 		</dl>
 
-		<dl>
-			<dd class="large" ng-if="repo.remote == 'gitlab.com' || repo.remote == 'github.com' || repo.remote == 'enterprise.github.com' ">
-				<strong>
-					commit 
-					<a href="http://{{ repo.host }}/{{ repo.owner }}/{{ repo.name }}/commit/{{ commit.sha }}" >{{ commit.sha | shortHash}}</a> 
-					to <a href="http://{{ repo.host }}/{{ repo.owner }}/{{ repo.name }}/tree/{{ commit.branch }}">{{ commit.branch }}</a> branch
-				</strong>
-			</dd>
-			<dd class="large" ng-if="repo.remote == 'bitbucket.org' ">
-				<strong>
-					commit 
-					<a href="http://{{ repo.host }}/{{ repo.owner }}/{{ repo.name }}/commits/{{ commit.sha }}" >{{ commit.sha | shortHash}}</a> 
-					to <a href="http://{{ repo.host }}/{{ repo.owner }}/{{ repo.name }}/src/?at={{ commit.branch }}">{{ commit.branch }}</a> branch
-				</strong>
-			</dd>
-			<dd class="large" ng-if="repo.remote != 'gitlab.com' && repo.remote != 'github.com' && repo.remote != 'enterprise.github.com' && repo.remote != 'bitbucket.org' ">
-				<strong>commit <u>{{ commit.sha | shortHash}}</u> to <u>{{ commit.branch }}</u> branch</strong>
-			</dd>
-			<dd ng-if="commit.finished_at != 0">{{ commit.finished_at | fromNow }}</dd>
-			<dd ng-if="commit.finished_at == 0 && commit.started_at != 0">Started {{ commit.started_at | fromNow }}</dd>
-			<dd ng-if="commit.finished_at == 0 && commit.started_at == 0">Created {{ commit.created_at}}</dd>
-		</dl>
-        </div>
+		<dl ng-include src="'/static/views/commit_detail.html'" ng-if="commit.pull_request.length == 0"></dl>
+		<dl ng-include src="'/static/views/commit_detail_pr.html'" ng-if="commit.pull_request.length != 0"></dl>
+		<dd ng-if="commit.finished_at != 0">{{ commit.finished_at | fromNow }}</dd>
+		<dd ng-if="commit.finished_at == 0 && commit.started_at != 0">Started {{ commit.started_at | fromNow }}</dd>
+		<dd ng-if="commit.finished_at == 0 && commit.started_at == 0">Created {{ commit.created_at}}</dd>
+	</div>
 </aside>
 
 <div id="main" class="output">
diff --git a/server/app/views/commit_detail.html b/server/app/views/commit_detail.html
new file mode 100644
index 000000000..639b73284
--- /dev/null
+++ b/server/app/views/commit_detail.html
@@ -0,0 +1,23 @@
+<!-- GITHUB && GITLAB -->
+<dd class="large" ng-if="repo.remote == 'gitlab.com' || repo.remote == 'github.com' || repo.remote == 'enterprise.github.com' ">
+	<strong>
+		commit 
+		<a href="{{ repo.url }}/commit/{{ commit.sha }}" >{{ commit.sha | shortHash}}</a> 
+		to <a href="{{ repo.url }}/tree/{{ commit.branch }}">{{ commit.branch }}</a> branch
+	</strong>
+</dd>
+<!-- /GITHUB && GITLAB -->
+<!-- BITBUCKET -->
+<dd class="large" ng-if="repo.remote == 'bitbucket.org' ">
+	<strong>
+		commit 
+		<a href="{{ repo.url }}/commits/{{ commit.sha }}" >{{ commit.sha | shortHash}}</a> 
+		to <a href="{{ repo.url }}/src/?at={{ commit.branch }}">{{ commit.branch }}</a> branch
+	</strong>
+</dd>
+<!-- /BITBUCKET -->
+<!-- STASH -->
+<dd class="large" ng-if="repo.remote != 'gitlab.com' && repo.remote != 'github.com' && repo.remote != 'enterprise.github.com' && repo.remote != 'bitbucket.org' ">
+	<strong>commit <u>{{ commit.sha | shortHash}}</u> to <u>{{ commit.branch }}</u> branch</strong>
+</dd>
+<!-- /STASH -->
\ No newline at end of file
diff --git a/server/app/views/commit_detail_pr.html b/server/app/views/commit_detail_pr.html
new file mode 100644
index 000000000..6669a7b38
--- /dev/null
+++ b/server/app/views/commit_detail_pr.html
@@ -0,0 +1,31 @@
+<!-- GITHUB -->
+<dd class="large" ng-if="repo.remote == 'github.com' || repo.remote == 'enterprise.github.com' ">
+	<strong>
+		Pull Request 
+		<a href="{{ repo.url }}/pull/{{ commit.pull_request }}" >#{{ commit.pull_request }}</a>
+	</strong>
+</dd>
+<!-- /GITHUB -->
+<!-- GITLAB -->
+<dd class="large" ng-if="repo.remote == 'gitlab.com'">
+	<strong>
+		Pull Request 
+		<a href="{{ repo.url }}/merge_requests/{{ commit.pull_request }}" >#{{ commit.pull_request }}</a>
+	</strong>
+</dd>
+<!-- /GITLAB -->
+<!-- BITBUCKET -->
+<dd class="large" ng-if="repo.remote == 'bitbucket.org' ">
+	<strong>
+		Pull Request 
+		<a href="{{ repo.url }}/pull-requests/{{ commit.pull_request }}" >#{{ commit.pull_request }}</a>
+	</strong>
+</dd>
+<!-- /BITBUCKET -->
+<!-- STASH -->
+<dd class="large" ng-if="repo.remote != 'gitlab.com' && repo.remote != 'github.com' && repo.remote != 'enterprise.github.com' && repo.remote != 'bitbucket.org' ">
+	<strong>			
+		Pull Request #{{ commit.pull_request }}
+	</strong>
+</dd>
+<!-- /STASH -->
\ No newline at end of file

From c7649e15b1513501ee9b4ee71ba9899d6a642a0d Mon Sep 17 00:00:00 2001
From: Kirill Zaitsev <kirik910@gmail.com>
Date: Mon, 27 Oct 2014 14:32:44 +0300
Subject: [PATCH 2/2] Add gitlab repo url

---
 plugin/remote/gitlab/gitlab.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin/remote/gitlab/gitlab.go b/plugin/remote/gitlab/gitlab.go
index 61423297f..b4e07597d 100644
--- a/plugin/remote/gitlab/gitlab.go
+++ b/plugin/remote/gitlab/gitlab.go
@@ -75,6 +75,7 @@ func (r *Gitlab) GetRepos(user *model.User) ([]*model.Repo, error) {
 			CloneURL: item.HttpRepoUrl,
 			GitURL:   item.HttpRepoUrl,
 			SSHURL:   item.SshRepoUrl,
+			URL:      item.Url,
 			Role:     &model.Perm{},
 		}