darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Brad Rydzewski 2014-02-08 13:39:22 -07:00
commit 57d852b3c2
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -16,7 +16,7 @@ using the following commands:
```sh ```sh
$ wget http://downloads.drone.io/latest/drone.deb $ wget http://downloads.drone.io/latest/drone.deb
$ dpkg -i drone.deb $ sudo dpkg -i drone.deb
$ sudo start drone $ sudo start drone
``` ```
@ -47,7 +47,7 @@ env:
script: script:
- go build - go build
- go test -v - go test -v
service: services:
- redis - redis
notify: notify:
email: email:
@ -147,7 +147,7 @@ if you are using a custom Docker image.
Drone can launch database containers for your build: Drone can launch database containers for your build:
``` ```
service: services:
- cassandra - cassandra
- couchdb - couchdb
- elasticsearch - elasticsearch

3
pkg/handler/admin.go
View file

@ -140,7 +140,7 @@ func AdminUserDelete(w http.ResponseWriter, r *http.Request, u *User) error {
return nil 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 { func AdminSettings(w http.ResponseWriter, r *http.Request, u *User) error {
// get settings from database // get settings from database
settings := database.SettingsMust() 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) 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 { func AdminSettingsUpdate(w http.ResponseWriter, r *http.Request, u *User) error {
// get settings from database // get settings from database
settings := database.SettingsMust() settings := database.SettingsMust()

2
pkg/template/pages/repo_badges.html
View file

@ -34,7 +34,7 @@
<div class="form-group"> <div class="form-group">
<img class="pull-right" src="{{.Host}}/{{.Repo.Slug}}/status.png?branch=master"> <img class="pull-right" src="{{.Host}}/{{.Repo.Slug}}/status.png?branch=master">
<label>Badge, Markdown format</label> <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>
<div class="form-group"> <div class="form-group">
<label>Badge, HTML format</label> <label>Badge, HTML format</label>