diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 00000000..eca07e4c --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.1.2 diff --git a/assets/images/icons/code-climate-icon.svg b/assets/images/icons/code-climate-icon.svg index 90e36dc6..685516b6 100644 --- a/assets/images/icons/code-climate-icon.svg +++ b/assets/images/icons/code-climate-icon.svg @@ -1,5 +1,9 @@ - - - - - + + + + + + + diff --git a/assets/images/icons/delete-log.svg b/assets/images/icons/delete-log.svg new file mode 100644 index 00000000..8a7d1917 --- /dev/null +++ b/assets/images/icons/delete-log.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + diff --git a/assets/images/icons/download-log.svg b/assets/images/icons/download-log.svg new file mode 100644 index 00000000..2f25c1f5 --- /dev/null +++ b/assets/images/icons/download-log.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + diff --git a/assets/images/icons/dropdown-arrow-white.svg b/assets/images/icons/dropdown-arrow-white.svg new file mode 100644 index 00000000..6dae63b2 --- /dev/null +++ b/assets/images/icons/dropdown-arrow-white.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/assets/images/icons/finished.svg b/assets/images/icons/finished.svg new file mode 100644 index 00000000..5e2b2781 --- /dev/null +++ b/assets/images/icons/finished.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + diff --git a/assets/images/icons/github.svg b/assets/images/icons/github.svg index 687b1a67..06c96d7b 100644 --- a/assets/images/icons/github.svg +++ b/assets/images/icons/github.svg @@ -1,4 +1,21 @@ - - - - + + + + + + diff --git a/assets/images/icons/logs.svg b/assets/images/icons/logs.svg index a7c3ad5f..2dbd3507 100644 --- a/assets/images/icons/logs.svg +++ b/assets/images/icons/logs.svg @@ -1,4 +1,14 @@ - - - - + + + + + + diff --git a/assets/images/icons/off.svg b/assets/images/icons/off.svg index 8e822a68..afc44783 100644 --- a/assets/images/icons/off.svg +++ b/assets/images/icons/off.svg @@ -1,4 +1,15 @@ - - - - + + + + + + diff --git a/assets/images/icons/pull-request.svg b/assets/images/icons/pull-request.svg new file mode 100644 index 00000000..dae09224 --- /dev/null +++ b/assets/images/icons/pull-request.svg @@ -0,0 +1,15 @@ + + + + + + + diff --git a/assets/images/icons/push.svg b/assets/images/icons/push.svg new file mode 100644 index 00000000..1d6f4b1d --- /dev/null +++ b/assets/images/icons/push.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/assets/images/icons/repeat.svg b/assets/images/icons/repeat.svg index 8b981450..6afd1b5a 100644 --- a/assets/images/icons/repeat.svg +++ b/assets/images/icons/repeat.svg @@ -1,4 +1,15 @@ - - - - + + + + + + diff --git a/assets/images/icons/run-time.svg b/assets/images/icons/run-time.svg new file mode 100644 index 00000000..c1acf337 --- /dev/null +++ b/assets/images/icons/run-time.svg @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/assets/images/icons/settings.svg b/assets/images/icons/settings.svg new file mode 100644 index 00000000..e37d316e --- /dev/null +++ b/assets/images/icons/settings.svg @@ -0,0 +1,21 @@ + + + + + + + + diff --git a/assets/images/icons/state-errored-white.svg b/assets/images/icons/state-errored-white.svg new file mode 100644 index 00000000..37f854b5 --- /dev/null +++ b/assets/images/icons/state-errored-white.svg @@ -0,0 +1,9 @@ + + + + + + diff --git a/assets/images/icons/state-failed-white.svg b/assets/images/icons/state-failed-white.svg new file mode 100644 index 00000000..08c0e0fd --- /dev/null +++ b/assets/images/icons/state-failed-white.svg @@ -0,0 +1,9 @@ + + + + + + diff --git a/assets/images/icons/state-passed-white.svg b/assets/images/icons/state-passed-white.svg new file mode 100644 index 00000000..b89db066 --- /dev/null +++ b/assets/images/icons/state-passed-white.svg @@ -0,0 +1,8 @@ + + + + + + diff --git a/assets/images/icons/state-pending-white.svg b/assets/images/icons/state-pending-white.svg new file mode 100644 index 00000000..f805df62 --- /dev/null +++ b/assets/images/icons/state-pending-white.svg @@ -0,0 +1,8 @@ + + + + + + diff --git a/assets/images/icons/tags.svg b/assets/images/icons/tags.svg new file mode 100644 index 00000000..61e057e0 --- /dev/null +++ b/assets/images/icons/tags.svg @@ -0,0 +1,13 @@ + + + + + + + diff --git a/assets/images/ui/close-white.png b/assets/images/ui/close-white.png deleted file mode 100644 index 1348122d..00000000 Binary files a/assets/images/ui/close-white.png and /dev/null differ diff --git a/assets/images/ui/close-white.svg b/assets/images/ui/close-white.svg new file mode 100644 index 00000000..358573f1 --- /dev/null +++ b/assets/images/ui/close-white.svg @@ -0,0 +1,9 @@ + + + + + + diff --git a/assets/images/ui/default-avatar.svg b/assets/images/ui/default-avatar.svg new file mode 100644 index 00000000..8abbd37d --- /dev/null +++ b/assets/images/ui/default-avatar.svg @@ -0,0 +1,8 @@ + + + + + + + diff --git a/assets/scripts/app/models/build.coffee b/assets/scripts/app/models/build.coffee index 974d5a9a..a5fb1809 100644 --- a/assets/scripts/app/models/build.coffee +++ b/assets/scripts/app/models/build.coffee @@ -15,6 +15,8 @@ require 'travis/model' pullRequest: Ember.attr('boolean') pullRequestTitle: Ember.attr('string') pullRequestNumber: Ember.attr(Number) + # TODO add eventType to the api for api build requests + # eventType: Ember.attr('string') repo: Ember.belongsTo('Travis.Repo', key: 'repository_id') commit: Ember.belongsTo('Travis.Commit') @@ -24,6 +26,11 @@ require 'travis/model' Travis.Helpers.compact(@get('_config')) ).property('_config') + # TODO add eventType to the api for api build requests + eventType: (-> + if @get('pullRequest') then 'pull_request' else 'push' + ).property('pullRequest') + isPullRequest: (-> @get('eventType') == 'pull_request' || @get('pullRequest') ).property('eventType') diff --git a/assets/scripts/app/models/job.coffee b/assets/scripts/app/models/job.coffee index 58c5d271..92a711fb 100644 --- a/assets/scripts/app/models/job.coffee +++ b/assets/scripts/app/models/job.coffee @@ -83,6 +83,14 @@ require 'travis/model' Travis.ajax.post "/jobs/#{@get('id')}/cancel" ) + removeLog: -> + Travis.ajax.patch("/jobs/#{@get('id')}/log").then => + @reloadLog() + + reloadLog: -> + @clearLog() + @get('log').fetch() + requeue: -> Travis.ajax.post "/jobs/#{@get('id')}/restart" @@ -125,6 +133,12 @@ require 'travis/model' moment(finishedAt).format('lll') ).property('finishedAt') + canRemoveLog: (-> + # This should somehow get the status of removed log, but unfortunately there is + # no easy way to do that at the moment + true + ).property() + @Travis.Job.reopenClass queued: -> filtered = Ember.FilteredRecordArray.create( diff --git a/assets/scripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs index eadc1042..cf71dc13 100644 --- a/assets/scripts/app/templates/builds/show.hbs +++ b/assets/scripts/app/templates/builds/show.hbs @@ -2,18 +2,41 @@ Loading {{else}}
+
+
+
+
{{#link-to "build" repo build}}#{{build.number}} {{build.state}}{{/link-to}}
- {{#if build.isFinished}}ran{{else}}running{{/if}} for {{formatDuration build.duration}} + {{#if build.isFinished}}ran{{else}}running{{/if}} for {{formatDuration build.duration}}
{{formatTime build.finishedAt}}
+ + {{#if build.tagName}} +
+ {{build.tagName}} +
+ {{/if}} + +
+ Commit {{formatSha commit.sha}} +
+
+ {{#if build.pullRequest}} + #{{build.pullRequestNumber}}: {{build.pullRequestTitle}} + {{else}} + {{#if build.commit.compareUrl}} + Compare {{shortCompareShas build.commit.compareUrl}} + {{/if}} + {{/if}} +
@@ -24,9 +47,7 @@ - {{formatMessage build.commit.subject repoBinding=build.repo}}
- 
-{{formatMessage build.commit.body repoBinding=build.repo pre=true}}
-
+ 
{{formatMessage build.commit.body repoBinding=build.repo pre=true}}
@@ -39,17 +60,6 @@ {{/if}} {{/unless}}
- -
-
Commit {{formatSha commit.sha}}
- {{#if build.pullRequest}} -
#{{build.pullRequestNumber}}: {{build.pullRequestTitle}}
- {{else}} - {{#if build.commit.compareUrl}} -
Compare {{shortCompareShas build.commit.compareUrl}}
- {{/if}} - {{/if}} -
diff --git a/assets/scripts/app/templates/jobs/show.hbs b/assets/scripts/app/templates/jobs/show.hbs index 2158964d..9d54e7d6 100644 --- a/assets/scripts/app/templates/jobs/show.hbs +++ b/assets/scripts/app/templates/jobs/show.hbs @@ -1,20 +1,43 @@ {{#if job.isLoaded}}
+
+
+
+
{{#link-to "job" repo job}}#{{job.number}} {{job.state}}{{/link-to}}
- {{#if job.isFinished}}ran{{else}}running{{/if}} for {{formatDuration job.duration}} + {{#if job.isFinished}}ran{{else}}running{{/if}} for {{formatDuration job.duration}}
{{formatTime job.finishedAt}}
+ + {{#if job.tagName}} +
+ {{job.tagName}} +
+ {{/if}} + +
+
Commit {{formatSha job.commit.sha}}
+
+
+ {{#if job.build.pullRequest}} +
#{{job.build.pullRequestNumber}}: {{job.build.pullRequestTitle}}
+ {{else}} + {{#if job.build.commit.compareUrl}} +
Compare {{shortCompareShas job.build.commit.compareUrl}}
+ {{/if}} + {{/if}} +
- +
{{job.commit.branch}}
@@ -23,9 +46,7 @@ - {{formatMessage job.commit.subject repoBinding=job.repo}}
- 
-{{formatMessage job.commit.body repoBinding=job.repo pre=true}}
-
+ 
{{formatMessage job.commit.body repoBinding=job.repo pre=true}}
@@ -38,17 +59,6 @@ {{/if}} {{/unless}}
- -
-
Commit {{formatSha job.commit.sha}}
- {{#if job.build.pullRequest}} -
#{{job.build.pullRequestNumber}}: {{job.build.pullRequestTitle}}
- {{else}} - {{#if job.commit.compareUrl}} -
Compare {{shortCompareShas job.commit.compareUrl}}
- {{/if}} - {{/if}} -
diff --git a/assets/scripts/app/templates/repos/show.hbs b/assets/scripts/app/templates/repos/show.hbs index 01dbc972..ec99feb8 100644 --- a/assets/scripts/app/templates/repos/show.hbs +++ b/assets/scripts/app/templates/repos/show.hbs @@ -7,6 +7,13 @@

{{#link-to "repo" this}}{{slug}}{{/link-to}}

+ +
+ + + +
+ {{view Travis.RepoShowToolsView}}
diff --git a/assets/scripts/app/templates/repos/show/actions.hbs b/assets/scripts/app/templates/repos/show/actions.hbs index c6626123..183ee63c 100644 --- a/assets/scripts/app/templates/repos/show/actions.hbs +++ b/assets/scripts/app/templates/repos/show/actions.hbs @@ -1,51 +1,49 @@