From 86e9ebdcc936fb093b4af2c3ccb8dac7a64d02a8 Mon Sep 17 00:00:00 2001 From: The Gitter Badger Date: Sun, 21 Dec 2014 07:53:06 +0000 Subject: [PATCH 1/3] Added Gitter badge --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 2b037b55cc0e..612f5172d49e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ Gogs - Go Git Service [![wercker status](https://app.wercker.com/status/ad0bdb0bc450ac6f09bc56b9640a50aa/s/ "wercker status")](https://app.wercker.com/project/bykey/ad0bdb0bc450ac6f09bc56b9640a50aa) [![Build Status](https://travis-ci.org/gogits/gogs.svg?branch=master)](https://travis-ci.org/gogits/gogs) ===================== +[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/gogits/gogs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + Gogs(Go Git Service) is a painless self-hosted Git Service written in Go. ![Demo](https://gowalker.org/public/gogs_demo.gif) From 995a805a3146aa9cf81c69fae1ab67df95093dce Mon Sep 17 00:00:00 2001 From: morpheyesh Date: Wed, 24 Dec 2014 13:20:10 +0530 Subject: [PATCH 2/3] spellcheck --- docker/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/README.md b/docker/README.md index 448912009c00..9f82cf7626a4 100644 --- a/docker/README.md +++ b/docker/README.md @@ -30,7 +30,7 @@ The `config` file contains lines which will in the gogs docker container end up Here you can define things like the MySQL server for your database block. The `fig` file will just be added to `fig.yml`, which is used by fig to manage your containers. -This inculdes container linking! +This includes container linking! Just have a look at them and it will be clear how to write your own blocks. @@ -53,7 +53,7 @@ Example: More sophisticated Example -------------------------- -Her is a more elaborated example +Here is a more elaborated example ```sh ./assemble_blocks.sh docker_gogs w_db_cache_session option_db_postgresql option_cache_redis option_session_mysql @@ -86,4 +86,4 @@ This will pull in the `Dockerfile` from `docker_gogs` instead of the one from `d `Dockerfile`s for the `master` and `dev` branch are provided as `docker_gogs` and `docker_gogs_dev` -[fig]:http://www.fig.sh/ \ No newline at end of file +[fig]:http://www.fig.sh/ From 30c750a5df1f5a6274e6371df3b18cd4c0a8936f Mon Sep 17 00:00:00 2001 From: Josh Kalderimis Date: Sat, 27 Dec 2014 01:23:10 +0100 Subject: [PATCH 3/3] Use the new build env on Travis http://docs.travis-ci.com/user/workers/container-based-infrastructure --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index eb5732ff6089..b060c69392ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,6 @@ language: go go: - 1.2 - - 1.3 \ No newline at end of file + - 1.3 + +sudo: false