Merge branch 'master' of github.com:gogits/gogs into dev

Conflicts:
	dockerfiles/README.md

7 files changed, 47 insertions, 7 deletions

diff --git a/.gopmfile b/.gopmfile
index 80f97bf12c..763aa054a3 100644
--- a/.gopmfile
+++ b/.gopmfile
@@ -2,6 +2,7 @@
 path = github.com/gogits/gogs
 
 [deps]
+code.google.com/p/mahonia = 
 github.com/Unknwon/cae = 
 github.com/Unknwon/com = 
 github.com/Unknwon/goconfig = 
@@ -20,9 +21,10 @@ github.com/macaron-contrib/cache =
 github.com/macaron-contrib/captcha = 
 github.com/macaron-contrib/csrf = 
 github.com/macaron-contrib/i18n = 
-github.com/macaron-contrib/session =
+github.com/macaron-contrib/session = 
 github.com/macaron-contrib/toolbox = 
 github.com/nfnt/resize = 
+github.com/saintfish/chardet = 
 
 [res]
 include = conf|etc|public|scripts|templates
diff --git a/.travis.yml b/.travis.yml
index dddf5d9d19..2600693b63 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,4 +2,5 @@ language: go
 
 go:
   - 1.2
+  - 1.3
   - tip
\ No newline at end of file
diff --git a/dockerfiles/README.md b/dockerfiles/README.md
new file mode 100644
index 0000000000..11d28d0fcb
--- /dev/null
+++ b/dockerfiles/README.md
@@ -0,0 +1,40 @@
+### Install Gogs With Docker
+
+Deploying gogs in [Docker](http://www.docker.io/) is just as easy as eating a pie, what you do is just open the `dockerfiles/build.sh` file, replace the configs:
+
+```
+DB_TYPE="YOUR_DB_TYPE"            # type of database, support 'mysql' and 'postgres'
+MEM_TYPE="YOUR_MEM_TYPE"          # type of memory database, support 'redis' and 'memcache'
+DB_PASSWORD="YOUR_DB_PASSWORD"    # The database password.
+DB_RUN_NAME="YOUR_DB_RUN_NAME"    # The --name option value when run the database image.
+MEM_RUN_NAME="YOUR_MEM_RUN_NAME"  # The --name option value when run the mem database image.
+HOST_PORT="YOUR_HOST_PORT"        # The port on host, which will be redirected to the port 3000 inside gogs container.
+```
+
+And run:
+```
+cd dockerfiles
+./build.sh
+```
+
+The build might take some time, just be patient. After it finishes, you will receive the message:
+
+```
+Now we have the MySQL image(running) and gogs image, use the follow command to start gogs service( the content might be different, according to your own configs):
+ docker run -i -t --link YOUR_DB_RUN_NAME:db  --link YOUR_MEM_RUN_NAME:mem  -p YOUR_HOST_PORT:3000 gogits/gogs 
+```
+
+Just follow the message, run:
+
+```
+ docker run -i -t --link YOUR_DB_RUN_NAME:db  --link YOUR_MEM_RUN_NAME:mem  -p YOUR_HOST_PORT:3000 gogits/gogs 
+```
+
+Now we have gogs running! Open the browser and navigate to:
+
+```
+http://YOUR_HOST_IP:YOUR_HOST_PORT
+```
+
+Let's 'gogs'!
+Ouya~
diff --git a/gogs.go b/gogs.go
index 4361bdb204..1e2150b3c3 100644
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.4.9.0830 Alpha"
+const APP_VER = "0.4.9.0831 Beta"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
diff --git a/models/webhook.go b/models/webhook.go
index 17a41e66c6..ced7936646 100644
--- a/models/webhook.go
+++ b/models/webhook.go
@@ -99,7 +99,7 @@ func GetWebhooksByRepoId(repoId int64) (ws []*Webhook, err error) {
 
 // UpdateWebhook updates information of webhook.
 func UpdateWebhook(w *Webhook) error {
-	_, err := x.AllCols().Update(w)
+	_, err := x.Id(w.Id).AllCols().Update(w)
 	return err
 }
 
diff --git a/scripts/dockerfiles/images/gogits/Dockerfile b/scripts/dockerfiles/images/gogits/Dockerfile
index bda9e424dd..9f2c58ae25 100644
--- a/scripts/dockerfiles/images/gogits/Dockerfile
+++ b/scripts/dockerfiles/images/gogits/Dockerfile
@@ -19,9 +19,6 @@ RUN cd /usr/local/go/src && ./make.bash --no-clean 2>&1
 RUN go get -u -d github.com/gogits/gogs
 RUN cd $GOPATH/src/github.com/gogits/gogs && git checkout dev && git pull origin dev && go install && go build -tags redis
 
-# Clean all the unused packages
-RUN apt-get autoremove -y
-RUN apt-get clean all
 
 # Add the deploy script to the docker image and assign execution permission to it.
 ADD ./deploy.sh /
diff --git a/templates/.VERSION b/templates/.VERSION
index 681da0e6de..fb2403adf0 100644
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.4.9.0830 Alpha
\ No newline at end of file
+0.4.9.0831 Beta
\ No newline at end of file