suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'deployment-plus-plus'

Browse Source 
Conflicts:
	assets/scripts/lib/travis/expandable_record_array.coffee
	public/scripts/app.js
	public/scripts/min/app.js
	public/styles/app.css
	public/version
This commit is contained in:
Piotr Sarnacki 2012-10-30 02:25:02 +01:00
commit 73055be147
9 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.buildpacks Normal file
View File

@ -0,0 +1,2 @@
https://github.com/heroku/heroku-buildpack-ruby.git
https://github.com/travis-ci/travis-web-buildpack.git

1
.slugignore
View File

@ -1,4 +1,3 @@
assets
spec
tmp
*.sql

3
AssetFile → Assetfile
View File

@ -4,6 +4,9 @@ require 'rake-pipeline-web-filters'
require 'travis/assets'
require 'compass'
Encoding.default_external = Encoding::UTF_8
Encoding.default_internal = Encoding::UTF_8
assets ||= Travis::Assets.new
assets.setup_compass
assets.update_version

13
Gemfile
View File

@ -7,17 +7,20 @@ gem 'rack-ssl', '~> 1.3'
gem 'rack-cache'
gem 'sinatra'
group :development, :test do
gem 'rake', '~> 0.9.2'
end
group :development do
group :assets do
gem 'rake-pipeline', github: 'livingsocial/rake-pipeline', ref: '3465e0e3e1'
gem 'rake-pipeline-web-filters', github: 'wycats/rake-pipeline-web-filters'
gem 'coffee-script'
gem 'compass'
gem 'tilt'
gem 'uglifier'
end
group :development, :test do
gem 'rake', '~> 0.9.2'
end
group :development do
gem 'debugger'
gem 'foreman'
gem 'rerun'

4
assets/scripts/app/views/build.coffee
View File

@ -55,8 +55,8 @@
currentItemBinding: 'build'
loading: (->
!@get('build.isComplete')
).property('build.isComplete')
!@get('build.isLoaded')
).property('build.isLoaded')
color: (->
Travis.Helpers.colorForResult(@get('build.result'))

2
public/scripts/app.js
View File

File diff suppressed because one or more lines are too long

2
public/scripts/min/app.js
View File

File diff suppressed because one or more lines are too long

15
public/styles/app.css
View File

@ -3132,11 +3132,10 @@ html, body {
#repos li .indicator span {
position: relative;
display: block;
top: 50%;
top: 25px;
left: -15px;
width: 20px;
height: 20px;
margin-top: -11px;
border: 1px solid #cccccc;
-webkit-transform: rotate(45deg);
-moz-transform: rotate(45deg);
@ -3147,12 +3146,12 @@ html, body {
-moz-box-shadow: #cccccc 0 1px 8px 0;
box-shadow: #cccccc 0 1px 8px 0;
}
/* line 78, /Volumes/travis/travis-web/assets/styles/left/list.sass */
/* line 77, /Volumes/travis/travis-web/assets/styles/left/list.sass */
#accounts li.selected .indicator,
#repos li.selected .indicator {
display: block;
}
/* line 81, /Volumes/travis/travis-web/assets/styles/left/list.sass */
/* line 80, /Volumes/travis/travis-web/assets/styles/left/list.sass */
#accounts .loading,
#repos .loading {
padding: 15px 25px 15px 30px;
@ -3160,22 +3159,22 @@ html, body {
background-image: none;
}
/* line 87, /Volumes/travis/travis-web/assets/styles/left/list.sass */
/* line 86, /Volumes/travis/travis-web/assets/styles/left/list.sass */
#accounts li {
margin-left: -4px;
padding-left: 52px;
}
/* line 90, /Volumes/travis/travis-web/assets/styles/left/list.sass */
/* line 89, /Volumes/travis/travis-web/assets/styles/left/list.sass */
#accounts li.user {
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA0AAAAMCAMAAACOacfrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBNYWNpbnRvc2giIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6Rjg2MkE3NjlGREQyMTFFMUFDNEREQzAwMkZFNkVGNjQiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6Rjg2MkE3NkFGREQyMTFFMUFDNEREQzAwMkZFNkVGNjQiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpGODYyQTc2N0ZERDIxMUUxQUM0RERDMDAyRkU2RUY2NCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpGODYyQTc2OEZERDIxMUUxQUM0RERDMDAyRkU2RUY2NCIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PrJlFK8AAABLUExURX9/f4eHh4WFhZCQkPLy8oiIiNra2vDw8LGxsf7+/sLCwvb29oCAgI+Pj5mZmdXV1ba2toODg52dnfPz87i4uN3d3aGhod/f3////yHAc80AAAAZdFJOU////////////////////////////////wABNAq3AAAAV0lEQVR42lTM2Q6AIAxE0YGCsuMu//+llqREvckkPS9F42pec+0HeJEAUBQZzdJGNP+lWHYXtYV1jC8tsILIT4VVJt91Xwm9tJ0NDm8O9iML0mqk6RFgAMVgBry2iJEPAAAAAElFTkSuQmCC');
background-position: 29px 18px;
}
/* line 93, /Volumes/travis/travis-web/assets/styles/left/list.sass */
/* line 92, /Volumes/travis/travis-web/assets/styles/left/list.sass */
#accounts li.organization {
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAAMCAMAAAC3DnawAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBNYWNpbnRvc2giIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OTQ3QkUxMjJGREQzMTFFMUFDNEREQzAwMkZFNkVGNjQiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OTQ3QkUxMjNGREQzMTFFMUFDNEREQzAwMkZFNkVGNjQiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpGODYyQTc2QkZERDIxMUUxQUM0RERDMDAyRkU2RUY2NCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpGODYyQTc2Q0ZERDIxMUUxQUM0RERDMDAyRkU2RUY2NCIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PnNJ4v8AAABgUExURX9/f4eHh5ubm5SUlIuLi/j4+NPT07Ozs9HR0ampqd7e3tnZ2aampsLCwoyMjMrKyuXl5ezs7KKiotzc3IGBgenp6eHh4ZeXl8DAwI+Pj/T09ImJia+vr9TU1P///5GRkUorc5sAAAAfdFJOU////////////////////////////////////////wDNGXYQAAAAjElEQVR42kSNiQ6DIBBEh0tYtJ4ohbb4/3/pKja+hM3yNplBqSxKqOXewc+7qSgAqkzOVzcC0Wh22kRgvFwLiNyz67MA2st5IOXELhm++Jon8SpvdueUNW/bQebHrjGEfWO3UoCwzcxubuwHgVZwLDkbcBK+jrgQMtpB448ebJS14+HuKJ146Ph/CDAAJA8LS8ZE6XkAAAAASUVORK5CYII=');
background-position: 24px 18px;
}
/* line 96, /Volumes/travis/travis-web/assets/styles/left/list.sass */
/* line 95, /Volumes/travis/travis-web/assets/styles/left/list.sass */
#accounts li .summary {
margin-left: 0;
}

2
public/version
View File

@ -1 +1 @@
fbed64d6
76a4c291