Skip to content

Commit

Permalink
Fix for build failures taking down staging environments in CI.
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremydw committed Sep 22, 2017
1 parent 5b348dc commit 49bb8c5
Show file tree
Hide file tree
Showing 7 changed files with 71 additions and 21 deletions.
3 changes: 0 additions & 3 deletions Dockerfile

This file was deleted.

11 changes: 4 additions & 7 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@
"name": "jetway",
"private": true,
"dependencies": {
"angular": "1.2.8",
"angular-bootstrap": "*",
"angular-ui-router": "*",
"angular-xeditable": "*",
"angular": "1.4.1",
"angular-bootstrap": "0.13.0",
"angular-ui-router": "0.2.15",
"angular-xeditable": "0.1.9",
"bootstrap": "3.2.0"
},
"resolutions": {
"angular": ">=1.3.0"
}
}
Binary file added config/grow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
63 changes: 63 additions & 0 deletions config/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 1 addition & 5 deletions jetway/filesets/services.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,13 +164,9 @@ def _get_me(self, request):
return users.User.get_by_email(email)

def _get_or_create_fileset(self, request, me):
allow_fileset_by_commit = (request.fileset.commit
and self._is_authorized_buildbot())
p = self._get_project(request)
try:
if allow_fileset_by_commit:
return filesets.Fileset.get(project=p, commit=request.fileset.commit)
elif request.fileset.ident:
if request.fileset.ident:
return filesets.Fileset.get_by_ident(request.fileset.ident)
else:
p = self._get_project(request)
Expand Down
5 changes: 1 addition & 4 deletions jetway/frontend/static/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ var app = angular.module('jetway', [
'xeditable'
])

.config(function($stateProvider, $urlRouterProvider, $locationProvider, $tooltipProvider) {
$tooltipProvider.options({
animation: false
});
.config(function($stateProvider, $urlRouterProvider, $locationProvider) {
$locationProvider.html5Mode(true);
$stateProvider
.state('home', {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"private": true,
"devDependencies": {
"bower": "*",
"gulp": "*",
"event-stream": "3.3.1",
"gulp": "*",
"gulp-autoprefixer": "^2.1.0",
"gulp-sass": "^1.3.3",
"gulp-concat": "*",
"gulp-plumber": "^1.0.0",
"gulp-sass": "^2.3.2",
"gulp-uglify": "*",
"jshint-stylish": "*",
"run-sequence": "^1.0.2"
Expand Down

0 comments on commit 49bb8c5

Please sign in to comment.