Skip to content

Commit cf79943

Browse files
author
Saso Matejina
committed
Merge master & update glide
2 parents 41627fc + 0cb6055 commit cf79943

File tree

39 files changed

+1348
-500
lines changed

39 files changed

+1348
-500
lines changed

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ $ make
2424
Local dashboard will be started on [http://localhost:3000](http://localhost:3000)
2525

2626
`dashboard` and `server` will reload on any file change :boom: Happy coding!!!
27+

dashboard/src/components/ProjectDeploy.js

+4-8
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,10 @@ class ProjectDeploy extends Component {
8080

8181
if (_.isEmpty(records)) {
8282
return(
83-
<ul className="list-group">
84-
<li>
85-
<Alert color="info">
86-
This project has no deployable features. Do some work and come back!
87-
</Alert>
88-
</li>
89-
</ul>
90-
)
83+
<Alert color="info">
84+
This project has no deployable features. Do some work and come back!
85+
</Alert>
86+
)
9187
}
9288

9389
let includedClass = ""

server/glide.lock

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/vendor/github.com/docker/docker/.gitignore

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/vendor/github.com/docker/docker/CHANGELOG.md

+32
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/vendor/github.com/docker/docker/api/types/swarm/swarm.go

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/vendor/github.com/docker/docker/cli/command/cli.go

+27-23
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/vendor/github.com/docker/docker/cli/command/service/opts.go

+29
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/vendor/github.com/docker/docker/cli/command/service/update.go

+5-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/vendor/github.com/docker/docker/cli/command/system/info.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)