Show pull request link, when commit related with pull request
This commit is contained in:
parent
09b4d6038d
commit
459759370f
3 changed files with 60 additions and 23 deletions
|
@ -11,29 +11,12 @@
|
||||||
<dd><h1>{{ commit.duration | toDuration}}</h1></dd>
|
<dd><h1>{{ commit.duration | toDuration}}</h1></dd>
|
||||||
</dl>
|
</dl>
|
||||||
|
|
||||||
<dl>
|
<dl ng-include src="'/static/views/commit_detail.html'" ng-if="commit.pull_request.length == 0"></dl>
|
||||||
<dd class="large" ng-if="repo.remote == 'gitlab.com' || repo.remote == 'github.com' || repo.remote == 'enterprise.github.com' ">
|
<dl ng-include src="'/static/views/commit_detail_pr.html'" ng-if="commit.pull_request.length != 0"></dl>
|
||||||
<strong>
|
<dd ng-if="commit.finished_at != 0">{{ commit.finished_at | fromNow }}</dd>
|
||||||
commit
|
<dd ng-if="commit.finished_at == 0 && commit.started_at != 0">Started {{ commit.started_at | fromNow }}</dd>
|
||||||
<a href="http://{{ repo.host }}/{{ repo.owner }}/{{ repo.name }}/commit/{{ commit.sha }}" >{{ commit.sha | shortHash}}</a>
|
<dd ng-if="commit.finished_at == 0 && commit.started_at == 0">Created {{ commit.created_at}}</dd>
|
||||||
to <a href="http://{{ repo.host }}/{{ repo.owner }}/{{ repo.name }}/tree/{{ commit.branch }}">{{ commit.branch }}</a> branch
|
</div>
|
||||||
</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>
|
|
||||||
</aside>
|
</aside>
|
||||||
|
|
||||||
<div id="main" class="output">
|
<div id="main" class="output">
|
||||||
|
|
23
server/app/views/commit_detail.html
Normal file
23
server/app/views/commit_detail.html
Normal file
|
@ -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 -->
|
31
server/app/views/commit_detail_pr.html
Normal file
31
server/app/views/commit_detail_pr.html
Normal file
|
@ -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 -->
|
Loading…
Reference in a new issue