diff --git a/assets/scripts/app/models/build.coffee b/assets/scripts/app/models/build.coffee index 03b20781..a98c373e 100644 --- a/assets/scripts/app/models/build.coffee +++ b/assets/scripts/app/models/build.coffee @@ -1,18 +1,20 @@ require 'travis/model' @Travis.Build = Travis.Model.extend Travis.DurationCalculations, - eventType: DS.attr('string') - repoId: DS.attr('number') - commitId: DS.attr('number') + eventType: DS.attr('string') + repoId: DS.attr('number') + commitId: DS.attr('number') - state: DS.attr('string') - number: DS.attr('number') - branch: DS.attr('string') - message: DS.attr('string') - _duration: DS.attr('number') - _config: DS.attr('object') - startedAt: DS.attr('string') - finishedAt: DS.attr('string') + state: DS.attr('string') + number: DS.attr('number') + branch: DS.attr('string') + message: DS.attr('string') + _duration: DS.attr('number') + _config: DS.attr('object') + startedAt: DS.attr('string') + finishedAt: DS.attr('string') + pullRequest: DS.attr('boolean') + pullRequestTitle: DS.attr('string') repo: DS.belongsTo('Travis.Repo') commit: DS.belongsTo('Travis.Commit') diff --git a/assets/scripts/app/models/commit.coffee b/assets/scripts/app/models/commit.coffee index 9e3be52f..18602b5c 100644 --- a/assets/scripts/app/models/commit.coffee +++ b/assets/scripts/app/models/commit.coffee @@ -10,7 +10,6 @@ require 'travis/model' authorEmail: DS.attr('string') committerName: DS.attr('string') committerEmail: DS.attr('string') - pullRequestTitle: DS.attr('string') pullRequestNumber: DS.attr('number') build: DS.belongsTo('Travis.Build') diff --git a/assets/scripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs index 447999d3..8815869f 100644 --- a/assets/scripts/app/templates/builds/show.hbs +++ b/assets/scripts/app/templates/builds/show.hbs @@ -25,9 +25,9 @@
{{t builds.commit}}
{{formatCommit build.commit}}
- {{#if build.isPullRequest}} + {{#if build.pullRequest}}
{{t builds.pullRequest}}
-
#{{build.commit.pullRequestNumber}} {{build.commit.pullRequestTitle}}
+
#{{build.commit.pullRequestNumber}} {{build.pullRequestTitle}}
{{else}} {{#if commit.compareUrl}}
{{t builds.compare}}