From 1aaa3a303d2d97f80e8725534afc3cb024d83635 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Fri, 4 Nov 2016 16:17:26 +0100 Subject: [PATCH 1/3] Use a correct format for CONTRIBUTORS and MAINTAINERS --- CONTRIBUTORS | 30 +++++++++--------------------- MAINTAINERS | 30 +++++++++--------------------- 2 files changed, 18 insertions(+), 42 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 0dab1a4bd..6219c36a2 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1,21 +1,9 @@ -# This is the official list of people who have contributed code to the Gitea/Gogs repository. -# This document should be reviewed and approved by maintainers. -# -# The submission process automatically checks to make sure -# that people submitting code are listed in this file (by email address). -# -# The agreement for individuals can be filled out on the web. -# - -# Names should be added to this file like so: -# Individual's name -# Individual's name -# -# An entry with multiple email addresses specifies that the -# first address should be used in the submit logs and -# that the other addresses should be recognized as the -# same person when interacting with github. - -# Please keep the list sorted. - -Lunny Xiao \ No newline at end of file +Andrey Nering <> (@andreynering) +Kim Carlbäcker (@bkcsoft) +LefsFlare <> (@LefsFlarey) +Lunny Xiao (@lunny) +Rachid Zarouali <> (@xinity) +Rémy Boulanouar (@DblK) +Sandro Santilli (@strk) +Thibault Meyer <> (@0xbaadf00d) +Thomas Boerger (@tboerger) diff --git a/MAINTAINERS b/MAINTAINERS index 746656c29..6219c36a2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1,21 +1,9 @@ -# This is the official list of people who have spent time on code review Pull Requests on the Gitea repository. -# This document should be reviewed and approved by owners. -# -# The submission process automatically checks to make sure -# that people submitting code are listed in this file (by email address). -# -# The agreement for individuals can be filled out on the web. -# - -# Names should be added to this file like so: -# Individual's name -# Individual's name -# -# An entry with multiple email addresses specifies that the -# first address should be used in the submit logs and -# that the other addresses should be recognized as the -# same person when interacting with github. - -# Please keep the list sorted. - -Lunny Xiao \ No newline at end of file +Andrey Nering <> (@andreynering) +Kim Carlbäcker (@bkcsoft) +LefsFlare <> (@LefsFlarey) +Lunny Xiao (@lunny) +Rachid Zarouali <> (@xinity) +Rémy Boulanouar (@DblK) +Sandro Santilli (@strk) +Thibault Meyer <> (@0xbaadf00d) +Thomas Boerger (@tboerger) From ccdbd8bf48846a27bcb19a9cc8df6640a4f8a2c5 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Fri, 4 Nov 2016 16:37:50 +0100 Subject: [PATCH 2/3] One more try to validate maintainers and contributors --- CONTRIBUTORS | 8 ++++---- MAINTAINERS | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 6219c36a2..65db51945 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1,9 +1,9 @@ -Andrey Nering <> (@andreynering) +Andrey Nering (@andreynering) Kim Carlbäcker (@bkcsoft) -LefsFlare <> (@LefsFlarey) +LefsFlare (@LefsFlarey) Lunny Xiao (@lunny) -Rachid Zarouali <> (@xinity) +Rachid Zarouali (@xinity) Rémy Boulanouar (@DblK) Sandro Santilli (@strk) -Thibault Meyer <> (@0xbaadf00d) +Thibault Meyer (@0xbaadf00d) Thomas Boerger (@tboerger) diff --git a/MAINTAINERS b/MAINTAINERS index 6219c36a2..65db51945 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1,9 +1,9 @@ -Andrey Nering <> (@andreynering) +Andrey Nering (@andreynering) Kim Carlbäcker (@bkcsoft) -LefsFlare <> (@LefsFlarey) +LefsFlare (@LefsFlarey) Lunny Xiao (@lunny) -Rachid Zarouali <> (@xinity) +Rachid Zarouali (@xinity) Rémy Boulanouar (@DblK) Sandro Santilli (@strk) -Thibault Meyer <> (@0xbaadf00d) +Thibault Meyer (@0xbaadf00d) Thomas Boerger (@tboerger) From 03902bb53df58e8591419bf529a32c46c4124874 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Fri, 4 Nov 2016 17:27:33 +0100 Subject: [PATCH 3/3] Minor cleanups, look at the specific commits (#67) * Dropped codebeat, we got go reportcard * Dropped gopm file, we are using govendor * Dropped chinese readme, this should be part of the docs * Dropped bra config, not really used * Dropped packager, we will provide our own packages --- .bra.toml | 19 ------- .codebeatignore | 7 --- .codebeatsettings | 7 --- .gopmfile | 59 --------------------- .pkgr.yml | 27 ---------- README.md | 2 - README_ZH.md | 113 ---------------------------------------- packager/.godir | 1 - packager/Procfile | 1 - packager/hooks/postinst | 24 --------- 10 files changed, 260 deletions(-) delete mode 100644 .bra.toml delete mode 100644 .codebeatignore delete mode 100644 .codebeatsettings delete mode 100644 .gopmfile delete mode 100644 .pkgr.yml delete mode 100644 README_ZH.md delete mode 100644 packager/.godir delete mode 100644 packager/Procfile delete mode 100755 packager/hooks/postinst diff --git a/.bra.toml b/.bra.toml deleted file mode 100644 index 3fd4e0c68..000000000 --- a/.bra.toml +++ /dev/null @@ -1,19 +0,0 @@ -[run] -init_cmds = [ - ["make", "build-dev"], - ["./gogs", "web"] -] -watch_all = true -watch_dirs = [ - "$WORKDIR/cmd", - "$WORKDIR/models", - "$WORKDIR/modules", - "$WORKDIR/routers" -] -watch_exts = [".go"] -ignore_files = [".+_test.go"] -build_delay = 1500 -cmds = [ - ["make", "build-dev"], # TAGS=sqlite cert pam tidb - ["./gogs", "web"] -] \ No newline at end of file diff --git a/.codebeatignore b/.codebeatignore deleted file mode 100644 index bfb9b911b..000000000 --- a/.codebeatignore +++ /dev/null @@ -1,7 +0,0 @@ -conf/** -docker/** -modules/bindata/** -packager/** -public/** -scripts/** -templates/** \ No newline at end of file diff --git a/.codebeatsettings b/.codebeatsettings deleted file mode 100644 index c6ee5c981..000000000 --- a/.codebeatsettings +++ /dev/null @@ -1,7 +0,0 @@ -{ - "GOLANG": { - "TOTAL_LOC": [500, 999, 1999, 9999], - "TOO_MANY_FUNCTIONS": [50, 99, 199, 999], - "TOO_MANY_IVARS": [20, 50, 70, 99] - } -} \ No newline at end of file diff --git a/.gopmfile b/.gopmfile deleted file mode 100644 index 45eb20f2e..000000000 --- a/.gopmfile +++ /dev/null @@ -1,59 +0,0 @@ -[target] -path = github.com/go-gitea/gitea - -[deps] -github.com/bradfitz/gomemcache = commit:fb1f79c -github.com/urfave/cli = commit:1efa31f -github.com/go-macaron/binding = commit:9440f33 -github.com/go-macaron/cache = commit:5617353 -github.com/go-macaron/captcha = commit:8aa5919 -github.com/go-macaron/csrf = commit:6a9a7df -github.com/go-macaron/gzip = commit:cad1c65 -github.com/go-macaron/i18n = commit:ef57533 -github.com/go-macaron/inject = commit:c5ab7bf -github.com/go-macaron/session = commit:66031fc -github.com/go-macaron/toolbox = commit:82b5115 -github.com/go-sql-driver/mysql = commit:0b58b37 -github.com/go-xorm/core = commit:5bf745d -github.com/go-xorm/xorm = commit:c6c7056 -github.com/gogits/chardet = commit:2404f77 -github.com/gogits/cron = commit:7f3990a -github.com/gogits/git-module = commit:5e0c133 -github.com/gogits/go-gogs-client = commit:c52f7ee -github.com/issue9/identicon = commit:d36b545 -github.com/jaytaylor/html2text = commit:52d9b78 -github.com/kardianos/minwinsvc = commit:cad6b2b -github.com/klauspost/compress = commit:14eb9c4 -github.com/klauspost/cpuid = commit:09cded8 -github.com/klauspost/crc32 = commit:19b0b33 -github.com/lib/pq = commit:80f8150 -github.com/mattn/go-sqlite3 = commit:e118d44 -github.com/mcuadros/go-version = commit:d52711f -github.com/microcosm-cc/bluemonday = commit:9dc1992 -github.com/msteinert/pam = commit:02ccfbf -github.com/nfnt/resize = commit:891127d -github.com/russross/blackfriday = commit:93622da -github.com/satori/go.uuid = commit:0aa62d5 -github.com/sergi/go-diff = commit:ec7fdbb -strk.kbt.io/projects/go/libravatar = commit:5eed7bf -github.com/shurcooL/sanitized_anchor_name = commit:10ef21a -github.com/Unknwon/cae = commit:7f5e046 -github.com/Unknwon/com = commit:28b053d -github.com/Unknwon/i18n = commit:39d6f27 -github.com/Unknwon/paginater = commit:7748a72 -golang.org/x/crypto = commit:bc89c49 -golang.org/x/net = commit:57bfaa8 -golang.org/x/sys = commit:a646d33 -golang.org/x/text = commit:2910a50 -gopkg.in/alexcesaro/quotedprintable.v3 = commit:2caba25 -gopkg.in/asn1-ber.v1 = commit:4e86f43 -gopkg.in/bufio.v1 = commit:567b2bf -gopkg.in/editorconfig/editorconfig-core-go.v1 = commit:a872f05 -gopkg.in/gomail.v2 = commit:81ebce5 -gopkg.in/ini.v1 = commit:cf53f92 -gopkg.in/ldap.v2 = commit:d0a5ced -gopkg.in/macaron.v1 = commit:7564489 -gopkg.in/redis.v2 = commit:e617904 - -[res] -include = public|scripts|templates diff --git a/.pkgr.yml b/.pkgr.yml deleted file mode 100644 index 9fa60ccba..000000000 --- a/.pkgr.yml +++ /dev/null @@ -1,27 +0,0 @@ -targets: - debian-7: &debian - build_dependencies: - - libpam0g-dev - dependencies: - - libpam0g - - git - debian-8: - <<: *debian - ubuntu-14.04: - <<: *debian - ubuntu-12.04: - <<: *debian - centos-6: &el - build_dependencies: - - pam-devel - dependencies: - - pam - - git - centos-7: - <<: *el -before: - - mv packager/Procfile . - - mv packager/.godir . -after: - - mv bin/main gogs -after_install: ./packager/hooks/postinst diff --git a/README.md b/README.md index bfd30ba00..f97e30934 100644 --- a/README.md +++ b/README.md @@ -26,8 +26,6 @@ 5. If you're interested in using APIs, we have experimental support with [documentation](https://github.com/gogits/go-gogs-client/wiki). 6. If your team/company is using Gogs and would like to put your logo on [our website](https://gogs.io), contact us by any means. -[简体中文](README_ZH.md) - ## Purpose The goal of this project is to make the easiest, fastest, and most painless way of setting up a self-hosted Git service. With Go, this can be done with an independent binary distribution across **ALL platforms** that Go supports, including Linux, Mac OS X, Windows and ARM. diff --git a/README_ZH.md b/README_ZH.md deleted file mode 100644 index bd61851df..000000000 --- a/README_ZH.md +++ /dev/null @@ -1,113 +0,0 @@ -# Gitea - Git with a cup of tea - -[![Build Status](https://travis-ci.org/go-gitea/gitea.svg?branch=master)](https://travis-ci.org/go-gitea/gitea) -[![codecov](https://codecov.io/gh/go-gitea/gitea/branch/master/graph/badge.svg)](https://codecov.io/gh/go-gitea/gitea) -[![Go Report Card](https://goreportcard.com/badge/github.com/go-gitea/gitea)](https://goreportcard.com/report/github.com/go-gitea/gitea) -[![GoDoc](https://godoc.org/github.com/go-gitea/gitea?status.svg)](https://godoc.org/github.com/go-gitea/gitea) -[![](https://images.microbadger.com/badges/image/gitea/gitea.svg)](http://microbadger.com/images/gitea/gitea "Get your own image badge on microbadger.com") -[![Join the chat at https://gitter.im/go-gitea/gitea](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/go-gitea/gitea?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) - -Gogs (Go Git Service) 是一款极易搭建的自助 Git 服务。 - -## 开发目的 - -Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自助 Git 服务。使用 Go 语言开发使得 Gogs 能够通过独立的二进制分发，并且支持 Go 语言支持的 **所有平台**，包括 Linux、Mac OS X、Windows 以及 ARM 平台。 - -## 项目概览 - -- 有关基本用法和变更日志，请通过 [使用手册](https://gogs.io/docs/intro/) 查看。 -- 您可以到 [Trello Board](https://trello.com/b/uxAoeLUl/gogs-go-git-service) 跟随开发团队的脚步。 -- 想要先睹为快？直接去 [在线体验](https://try.gogs.io/gogs/gogs) 。 -- 使用过程中遇到问题？尝试从 [故障排查](https://gogs.io/docs/intro/troubleshooting.html) 页面或 [用户论坛](https://discuss.gogs.io/) 获取帮助。 -- 希望帮助多国语言界面的翻译吗？请立即访问 [详情页面](https://gogs.io/docs/features/i18n.html)！ - -## 功能特性 - -- 支持活动时间线 -- 支持 SSH 以及 HTTP/HTTPS 协议 -- 支持 SMTP、LDAP 和反向代理的用户认证 -- 支持反向代理子路径 -- 支持用户、组织和仓库管理系统 -- 支持添加和删除仓库协作者 -- 支持仓库和组织级别 Web 钩子（包括 Slack 集成） -- 支持仓库 Git 钩子和部署密钥 -- 支持仓库工单（Issue）、合并请求（Pull Request）以及 Wiki -- 支持迁移和镜像仓库以及它的 Wiki -- 支持在线编辑仓库文件和 Wiki -- 支持自定义源的 Gravatar 和 Federated Avatar -- 支持邮件服务 -- 支持后台管理面板 -- 支持 MySQL、PostgreSQL、SQLite3 和 [TiDB](https://github.com/pingcap/tidb)（实验性支持） 数据库 -- 支持多语言本地化（[19 种语言]([more](https://crowdin.com/project/gogs))） - -## 系统要求 - -- 最低的系统硬件要求为一个廉价的树莓派 -- 如果用于团队项目，建议使用 2 核 CPU 及 1GB 内存 - -## 浏览器支持 - -- 请根据 [Semantic UI](https://github.com/Semantic-Org/Semantic-UI#browser-support) 查看具体支持的浏览器版本。 -- 官方支持的最小 UI 尺寸为 **1024*768**，UI 不一定会在更小尺寸的设备上被破坏，但我们无法保证且不会修复。 - -## 安装部署 - -在安装 Gogs 之前，您需要先安装 [基本环境](https://gogs.io/docs/installation)。 - -然后，您可以通过以下 5 种方式来安装 Gogs： - -- [二进制安装](https://gogs.io/docs/installation/install_from_binary.html) -- [源码安装](https://gogs.io/docs/installation/install_from_source.html) -- [包管理安装](https://gogs.io/docs/installation/install_from_packages.html) -- [采用 Docker 部署](https://github.com/go-gitea/gitea/tree/master/docker) -- [通过 Vagrant 安装](https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs) - -### 使用教程 - -- [使用 Gogs 搭建自己的 Git 服务器](https://mynook.info/blog/post/host-your-own-git-server-using-gogs) -- [阿里云上 Ubuntu 14.04 64 位安装 Gogs](http://my.oschina.net/luyao/blog/375654) - -### 云端部署 - -- [OpenShift](https://github.com/tkisme/gogs-openshift) -- [Cloudron](https://cloudron.io/appstore.html#io.gogs.cloudronapp) -- [Scaleway](https://www.scaleway.com/imagehub/gogs/) -- [Portal](https://portaldemo.xyz/cloud/) -- [Sandstorm](https://github.com/cem/gogs-sandstorm) -- [sloppy.io](https://github.com/sloppyio/quickstarters/tree/master/gogs) -- [YunoHost](https://github.com/mbugeia/gogs_ynh) -- [DPlatform](https://github.com/j8r/DPlatform) - -## 软件及服务支持 - -- [Drone](https://github.com/drone/drone)（CI） -- [Fabric8](http://fabric8.io/)（DevOps） -- [Taiga](https://taiga.io/)（项目管理） -- [Puppet](https://forge.puppetlabs.com/Siteminds/gogs)（IT） -- [Kanboard](http://kanboard.net/plugin/gogs-webhook)（项目管理） -- [BearyChat](https://bearychat.com/)（团队交流） -- [HiWork](http://www.hiwork.cc/)（团队交流） - -### 产品支持 - -- [Synology](https://www.synology.com)（Docker） -- [One Space](http://www.onespace.cc)（应用商店） - -## 特别鸣谢 - -- 基于 [Macaron](https://github.com/go-macaron/macaron) 的路由与中间件机制。 -- 基于 [GoBlog](https://github.com/fuxiaohei/goblog) 修改的系统监视状态。 -- 感谢 [Rocker](http://weibo.com/rocker1989) 设计的 Logo。 -- 感谢 [Crowdin](https://crowdin.com/project/gogs) 提供免费的开源项目本地化支持。 -- 感谢 [DigitalOcean](https://www.digitalocean.com) 提供主站和体验站点的服务器赞助。 -- 感谢 [KeyCDN](https://www.keycdn.com/) 和 [七牛云存储](http://www.qiniu.com/) 提供 CDN 服务赞助。 - -## 贡献成员 - -- 前团队成员 [@lunny](https://github.com/lunny)、[@fuxiaohei](https://github.com/fuxiaohei) 和 [@slene](https://github.com/slene)。 -- 您可以通过查看 [贡献者页面](https://github.com/go-gitea/gitea/graphs/contributors) 获取完整的贡献者列表。 -- 您可以通过查看 [TRANSLATORS](conf/locale/TRANSLATORS) 文件获取公开的翻译人员列表。 - -## 授权许可 - -本项目采用 MIT 开源授权许可证，完整的授权说明已放置在 [LICENSE](https://github.com/go-gitea/gitea/blob/master/LICENSE) 文件中。 diff --git a/packager/.godir b/packager/.godir deleted file mode 100644 index ba2906d06..000000000 --- a/packager/.godir +++ /dev/null @@ -1 +0,0 @@ -main diff --git a/packager/Procfile b/packager/Procfile deleted file mode 100644 index efa00d25a..000000000 --- a/packager/Procfile +++ /dev/null @@ -1 +0,0 @@ -web: ./gogs web diff --git a/packager/hooks/postinst b/packager/hooks/postinst deleted file mode 100755 index 561080eff..000000000 --- a/packager/hooks/postinst +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -set -e - -APP_NAME="gogs" -CLI="${APP_NAME}" -APP_USER=$(${CLI} config:get APP_USER) -APP_GROUP=$(${CLI} config:get APP_GROUP) -APP_CONFIG="/etc/${APP_NAME}/conf/app.ini" - -mkdir -p $(dirname ${APP_CONFIG}) -chown ${APP_USER}.${APP_GROUP} $(dirname ${APP_CONFIG}) -[ -f ${APP_CONFIG} ] || ${CLI} run cp conf/app.ini ${APP_CONFIG} -${CLI} config:set USER=${APP_USER} -sed -i "s|RUN_USER = git|RUN_USER = ${APP_USER}|" ${APP_CONFIG} -sed -i "s|RUN_MODE = dev|RUN_MODE = prod|" ${APP_CONFIG} - -${CLI} config:set GOGS_CUSTOM=/etc/${APP_NAME} - -# scale -${CLI} scale web=1 || true - -# restart the service -service gogs restart || true