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

Conflicts:
	dockerfiles/README.md

diff --cc .gopmfile
index 80f97bf12cbbcfca29a425c79fd02c2b05319df6,b8aa02372a31289e26771827912156b4d4ffb90a..763aa054a3f82c36d6bd396b4ecda4ce0a60d28a
--- 1/.gopmfile
--- 2/.gopmfile
+++ b/.gopmfile
@@@ -2,28 -2,24 +2,30 @@@
  path = github.com/gogits/gogs
  
  [deps]
 -github.com/Unknwon/cae = `commit:a1fa53b`
 -github.com/Unknwon/com = `commit:019c36f`
 -github.com/Unknwon/goconfig = `commit:c4e325f`
 -github.com/codegangsta/cli = `commit:bb91895`
 -github.com/go-martini/martini = `commit:49411a5`
 -github.com/go-sql-driver/mysql = `commit:b44cac6`
 -github.com/go-xorm/core = `commit:267e375`
 -github.com/go-xorm/xorm = `commit:bd1487b`
 -github.com/gogits/cache = `commit:f9bb61f`
 -github.com/gogits/gfm = `commit:40f747a`
 -github.com/gogits/git = `commit:3d9e771`
 -github.com/gogits/logs = `commit:0a97a46`
 -github.com/gogits/oauth2 = `commit:99cbec8`
 -github.com/gogits/session = `commit:7ab78d4`
 -github.com/juju2013/goldap = `commit:f4a7f67`
 -github.com/lib/pq = `commit:529edd9`
 -github.com/nfnt/resize = `commit:8aee0d9`
++code.google.com/p/mahonia = 
 +github.com/Unknwon/cae = 
 +github.com/Unknwon/com = 
 +github.com/Unknwon/goconfig = 
 +github.com/Unknwon/i18n = 
 +github.com/Unknwon/macaron = 
 +github.com/codegangsta/cli = 
 +github.com/go-sql-driver/mysql = 
 +github.com/go-xorm/core = 
 +github.com/go-xorm/xorm = 
 +github.com/gogits/gfm = 
 +github.com/gogits/git = 
 +github.com/gogits/oauth2 = 
 +github.com/juju2013/goldap = 
 +github.com/lib/pq = 
 +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 = templates|public
 +include = conf|etc|public|scripts|templates
  

diff --cc .travis.yml
index dddf5d9d19421089e11b98cad78e8c76ed76a663,dddf5d9d19421089e11b98cad78e8c76ed76a663..2600693b63543ffd02d3f1ae1d00910c025a5227
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -2,4 -2,4 +2,5 @@@ language: g
  
  go:
    - 1.2
++  - 1.3
    - tip

diff --cc gogs.go
index 4361bdb204d8385102cc901852bf0fabec6d5fed,7207baaadeaa2388506cef5386f3ca54bdd7f645..1e2150b3c303495cfc9686c465e347d77de94a92
--- 1/gogs.go
--- 2/gogs.go
+++ b/gogs.go
@@@ -17,7 -17,7 +17,7 @@@ import 
        "github.com/gogits/gogs/modules/setting"
  )
  
- const APP_VER = "0.4.9.0830 Alpha"
 -const APP_VER = "0.4.5.0704 Alpha"
++const APP_VER = "0.4.9.0831 Beta"
  
  func init() {
        runtime.GOMAXPROCS(runtime.NumCPU())

diff --cc models/webhook.go
index 17a41e66c65e7c3ff9a733ae1dbac2c652575852,9044befba2d21d99ba846d99ba09d8361bbf3d49..ced7936646c953cf1669d2c1e61a02ff3575ba3f
--- 1/models/webhook.go
--- 2/models/webhook.go
+++ b/models/webhook.go
@@@ -99,7 -98,7 +99,7 @@@ func GetWebhooksByRepoId(repoId int64) 
  
  // 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 --cc scripts/dockerfiles/images/gogits/Dockerfile
index bda9e424dd151980d4444156d5f66e0f3d71557a,0000000000000000000000000000000000000000..9f2c58ae25daf097fca6b7d090bb15d415b4d248
mode 100644,000000..100644
--- 1/scripts/dockerfiles/images/gogits/Dockerfile
--- /dev/null
+++ b/scripts/dockerfiles/images/gogits/Dockerfile
@@@ -1,32 -1,0 +1,29 @@@
- # Clean all the unused packages
- RUN apt-get autoremove -y
- RUN apt-get clean all
 +FROM stackbrew/ubuntu:13.10
 +MAINTAINER  Meaglith Ma <genedna@gmail.com> (@genedna)
 +
 +#aliyun#RUN echo "deb http://mirrors.aliyun.com/ubuntu/ saucy main restricted" > /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-updates main restricted" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy universe" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-updates universe" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy multiverse" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-updates multiverse" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-backports main restricted universe multiverse" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-security main restricted" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-security universe" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-security multiverse" >> /etc/apt/sources.list
 +
 +#nchc#RUN echo "deb http://free.nchc.org.tw/ubuntu/ saucy main restricted" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy main restricted" >> /etc/apt/source.list && echo "deb http://free.nchc.org.tw/ubuntu/ saucy-updates main restricted" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy-updates main restricted" >> /etc/apt/source.list && echo "deb http://free.nchc.org.tw/ubuntu/ saucy universe" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy universe" >> /etc/apt/source.list && echo "deb http://free.nchc.org.tw/ubuntu/ saucy-updates universe" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy-updates universe" >> /etc/apt/source.list && echo "deb http://free.nchc.org.tw/ubuntu/ saucy multiverse" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy multiverse" >> /etc/apt/source.list && echo "deb http://free.nchc.org.tw/ubuntu/ saucy-updates multiverse" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy-updates multiverse" >> /etc/apt/source.list && echo "deb http://free.nchc.org.tw/ubuntu/ saucy-backports main restricted universe multiverse" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy-backports main restricted universe multiverse" >> /etc/apt/source.list && echo "deb http://free.nchc.org.tw/ubuntu/ saucy-security main restricted" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy-security main restricted" >> /etc/apt/source.list && echo "deb http://free.nchc.org.tw/ubuntu/ saucy-security universe" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy-security universe" >> /etc/apt/source.list && echo "deb http://free.nchc.org.tw/ubuntu/ saucy-security multiverse" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy-security multiverse" >> /etc/apt/source.list && echo "deb http://extras.ubuntu.com/ubuntu saucy main" >> /etc/apt/source.list && echo "deb-src http://extras.ubuntu.com/ubuntu saucy main" >> /etc/apt/source.list
 +
 +RUN mkdir -p /go
 +ENV PATH /usr/local/go/bin:/go/bin:$PATH
 +ENV GOROOT /usr/local/go
 +ENV GOPATH /go
 +
 +RUN apt-get update && apt-get install --yes --force-yes curl git mercurial zip wget ca-certificates build-essential
 +RUN apt-get install -yq vim sudo
 +
 +RUN curl -sL https://golang.org/dl/go1.3.linux-amd64.tar.gz | tar -v -C /usr/local -xz
 +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
 +
 +
 +# Add the deploy script to the docker image and assign execution permission to it.
 +ADD ./deploy.sh /
 +RUN chmod +x deploy.sh
 +
 +EXPOSE 3000
 +
 +CMD /deploy.sh

diff --cc templates/.VERSION
index 681da0e6de21c74f2490bc7eeff1971c12bc73cb,0000000000000000000000000000000000000000..fb2403adf0cc8945fccc69dd7f60bb5751c9efe8
mode 100644,000000..100644
--- 1/templates/.VERSION
--- /dev/null
+++ b/templates/.VERSION
@@@ -1,1 -1,0 +1,1 @@@
- 0.4.9.0830 Alpha
++0.4.9.0831 Beta