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/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs index c51ec673..8815869f 100644 --- a/assets/scripts/app/templates/builds/show.hbs +++ b/assets/scripts/app/templates/builds/show.hbs @@ -25,9 +25,14 @@
{{t builds.commit}}
{{formatCommit build.commit}}
- {{#if commit.compareUrl}} -
{{t builds.compare}}
-
{{pathFrom build.commit.compareUrl}}
+ {{#if build.pullRequest}} +
{{t builds.pullRequest}}
+
#{{build.commit.pullRequestNumber}} {{build.pullRequestTitle}}
+ {{else}} + {{#if commit.compareUrl}} +
{{t builds.compare}}
+
{{pathFrom build.commit.compareUrl}}
+ {{/if}} {{/if}} {{#if commit.authorName}}
{{t builds.author}}
diff --git a/locales/de.yml b/locales/de.yml index cef61521..6766e5a4 100644 --- a/locales/de.yml +++ b/locales/de.yml @@ -20,6 +20,7 @@ de: sponsored_by: Dieser Testablauf lief auf einem Arbeiter-Rechner gesponsert von name: pr: + pull_request: started_at: Läuft state: Status datetime: diff --git a/locales/en.yml b/locales/en.yml index 26473318..de37e234 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -20,6 +20,7 @@ en: sponsored_by: This test series was run on a worker box sponsored by name: Build pr: PR + pull_request: Pull Request started_at: Started state: State datetime: diff --git a/locales/es.yml b/locales/es.yml index 5ff32073..c004b639 100644 --- a/locales/es.yml +++ b/locales/es.yml @@ -20,6 +20,7 @@ es: sponsored_by: Esta serie de tests han sido ejecutados en una caja de Proceso patrocinada por name: Build pr: + pull_request: started_at: Iniciado state: datetime: diff --git a/locales/fr.yml b/locales/fr.yml index e1e403d0..ea556788 100644 --- a/locales/fr.yml +++ b/locales/fr.yml @@ -20,6 +20,7 @@ fr: sponsored_by: Cette série de tests a été exécutée sur une machine sponsorisée par name: Version pr: + pull_request: started_at: Commencé state: datetime: diff --git a/locales/ja.yml b/locales/ja.yml index 4cf27327..5b70bcd7 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -20,6 +20,7 @@ ja: sponsored_by: このテストは以下のスポンサーの協力で行いました。 name: ビルド pr: + pull_request: started_at: 開始時刻 state: datetime: diff --git a/locales/nb.yml b/locales/nb.yml index 5532535e..c8ce62af 100644 --- a/locales/nb.yml +++ b/locales/nb.yml @@ -20,6 +20,7 @@ nb: sponsored_by: Denne testen ble kjørt på en maskin sponset av name: Jobb pr: + pull_request: started_at: Startet state: datetime: diff --git a/locales/nl.yml b/locales/nl.yml index 1a213643..b6a50d96 100644 --- a/locales/nl.yml +++ b/locales/nl.yml @@ -20,6 +20,7 @@ nl: sponsored_by: Deze tests zijn gedraaid op een machine gesponsord door name: Bouw pr: + pull_request: started_at: Gestart state: datetime: diff --git a/locales/pl.yml b/locales/pl.yml index 0037df7c..fd4ad095 100644 --- a/locales/pl.yml +++ b/locales/pl.yml @@ -20,6 +20,7 @@ pl: sponsored_by: Te testy zostały uruchomione na maszynie sponsorowanej przez name: Build pr: + pull_request: started_at: Rozpoczęto state: status datetime: diff --git a/locales/pt-BR.yml b/locales/pt-BR.yml index 1ab63836..93e34f24 100644 --- a/locales/pt-BR.yml +++ b/locales/pt-BR.yml @@ -20,6 +20,7 @@ pt-BR: sponsored_by: Esta série de testes foi executada em uma caixa de processos patrocinada por name: Build pr: + pull_request: started_at: Iniciou em state: datetime: diff --git a/locales/ru.yml b/locales/ru.yml index a3752aaa..b647458e 100644 --- a/locales/ru.yml +++ b/locales/ru.yml @@ -20,6 +20,7 @@ ru: sponsored_by: Эта серия тестов была запущена на машине, спонсируемой name: Билд pr: PR + pull_request: started_at: Начало state: состояние datetime: