Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
57d852b3c2
3 changed files with 6 additions and 7 deletions
|
@ -16,7 +16,7 @@ using the following commands:
|
|||
|
||||
```sh
|
||||
$ wget http://downloads.drone.io/latest/drone.deb
|
||||
$ dpkg -i drone.deb
|
||||
$ sudo dpkg -i drone.deb
|
||||
$ sudo start drone
|
||||
```
|
||||
|
||||
|
@ -47,7 +47,7 @@ env:
|
|||
script:
|
||||
- go build
|
||||
- go test -v
|
||||
service:
|
||||
services:
|
||||
- redis
|
||||
notify:
|
||||
email:
|
||||
|
@ -147,7 +147,7 @@ if you are using a custom Docker image.
|
|||
Drone can launch database containers for your build:
|
||||
|
||||
```
|
||||
service:
|
||||
services:
|
||||
- cassandra
|
||||
- couchdb
|
||||
- elasticsearch
|
||||
|
|
|
@ -140,7 +140,7 @@ func AdminUserDelete(w http.ResponseWriter, r *http.Request, u *User) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
// Display a list of ALL users in the system
|
||||
// Return an HTML form for the User to update the site settings.
|
||||
func AdminSettings(w http.ResponseWriter, r *http.Request, u *User) error {
|
||||
// get settings from database
|
||||
settings := database.SettingsMust()
|
||||
|
@ -153,7 +153,6 @@ func AdminSettings(w http.ResponseWriter, r *http.Request, u *User) error {
|
|||
return RenderTemplate(w, "admin_settings.html", &data)
|
||||
}
|
||||
|
||||
// Display a list of ALL users in the system
|
||||
func AdminSettingsUpdate(w http.ResponseWriter, r *http.Request, u *User) error {
|
||||
// get settings from database
|
||||
settings := database.SettingsMust()
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
<div class="form-group">
|
||||
<img class="pull-right" src="{{.Host}}/{{.Repo.Slug}}/status.png?branch=master">
|
||||
<label>Badge, Markdown format</label>
|
||||
<textarea class="form-control" rows="3">[![Build Status]({{.Host}}/{{.Repo.Name}}/status.png?branch=master)]({{.Host}}/{{.Repo.Name}}/tree/master)</textarea>
|
||||
<textarea class="form-control" rows="3">[![Build Status]({{.Host}}/{{.Repo.Slug}}/status.png?branch=master)]({{.Host}}/{{.Repo.Slug}}/tree/master)</textarea>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>Badge, HTML format</label>
|
||||
|
@ -47,4 +47,4 @@
|
|||
{{ end }}
|
||||
|
||||
{{ define "script" }}
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
|
|
Loading…
Reference in a new issue