Merge github.com:go-gitea/gitea into config_show_user_email_in_explore

* github.com:go-gitea/gitea: (110 commits)
  add default values for SSH settings (go-gitea#500)
  slight optimization for GetUserRepositories (go-gitea#498)
  commithgraph / timeline (go-gitea#428)
  Permissions bug fix for webhooks
  Implementation of Folder Jumping
  Replace Gogs with Gitea (go-gitea#520)
  API endpoints for organization teams (go-gitea#370)
  Optimization for user.GetRepositoryAccesses to reduce db query times (go-gitea#495)
  Remove redundant query in collaborator API (go-gitea#516)
  ignore static files statstics for linguist
  Fix default cookie name
  fix installation page ssh domain unavilable
  fix 500 when delete orgnization and resolved go-gitea#486
  At the locales replaced 6 with MIN_PASSWORD_LENGTH
  Added Dutch translations to the landingpage
  Improve the way how branches are deleted
  Improve issue references in markdown (go-gitea#471)
  API Endpoints for collaborators (go-gitea#375)
  Git LFS support v2 (go-gitea#122)
  Provide button to delete merged pull request (go-gitea#441)
  ...

.drone.yml

@@ -8,10 +8,12 @@ pipeline:
  pull: true
  environment:
  CGO_ENABLED: 1
- TAGS: sqlite tidb pam
+ TAGS: sqlite bindata
+ GOPATH: /srv/app
  commands:
- - apk -U add linux-pam-dev openssh-client
+ - apk -U add openssh-client
  - make clean
+ - make generate
  - make vet
  - make lint
  - make test
@@ -22,42 +24,62 @@ pipeline:
  test-mysql:
  image: webhippie/golang:edge
  pull: true
+ environment:
+ CGO_ENABLED: 1
+ TAGS: sqlite bindata
+ GOPATH: /srv/app
  commands:
- - make test-mysql
+  - make test-mysql
  when:
  event: [ push ]
 
  test-pgsql:
  image: webhippie/golang:edge
  pull: true
+ environment:
+ CGO_ENABLED: 1
+ TAGS: sqlite bindata
+ GOPATH: /srv/app
  commands:
- - make test-pgsql
+  - make test-pgsql
  when:
  event: [ push ]
 
- coverage:
- image: plugins/coverage
- server: https://coverage.gitea.io
- when:
- event: [ push, tag, pull_request ]
-
  updater:
  image: karalabe/xgo-latest:latest
  pull: true
+ environment:
+ CGO_ENABLED: 1
+ TAGS: sqlite bindata
+ GOPATH: /srv/app
  commands:
  - make release
  when:
  event: [ push, tag ]
- branch: [ master, refs/tags/* ]
+ branch: [ master, release/*, refs/tags/* ]
+
+ coverage:
+ image: plugins/coverage
+ server: https://coverage.gitea.io
+ when:
+ event: [ push, tag, pull_request ]
 
  docker:
  image: plugins/docker
  repo: gitea/gitea
- tags: [ '${TAG}' ]
+ tags: [ '${DRONE_TAG##v}' ]
  when:
  event: [ tag ]
  branch: [ refs/tags/* ]
 
+ docker:
+ image: plugins/docker
+ repo: gitea/gitea
+ tags: [ '${DRONE_BRANCH##release/v}' ]
+ when:
+ event: [ push ]
+ branch: [ release/* ]
+
  docker:
  image: plugins/docker
  repo: gitea/gitea
@@ -71,20 +93,30 @@ pipeline:
  path_style: true
  strip_prefix: dist/release/
  source: dist/release/*
- target: /gitea/master
+ target: /gitea/${DRONE_TAG##v}
+ when:
+ event: [ tag ]
+ branch: [ refs/tags/* ]
+
+ release:
+ image: plugins/s3
+ path_style: true
+ strip_prefix: dist/release/
+ source: dist/release/*
+ target: /gitea/${DRONE_BRANCH##release/v}
  when:
  event: [ push ]
- branch: [ master ]
+ branch: [ release/* ]
 
  release:
  image: plugins/s3
  path_style: true
  strip_prefix: dist/release/
  source: dist/release/*
- target: /gitea/$$TAG
+ target: /gitea/master
  when:
- event: [ tag ]
- branch: [ refs/tags/* ]
+ event: [ push ]
+ branch: [ master ]
 
  github:
  image: plugins/github-release

.drone.yml.sig

@@ -1 +1 @@
-eyJhbGciOiJIUzI1NiJ9.d29ya3NwYWNlOgogIGJhc2U6IC9zcnYvYXBwCiAgcGF0aDogc3JjL2NvZGUuZ2l0ZWEuaW8vZ2l0ZWEKCnBpcGVsaW5lOgogIHRlc3Q6CiAgICBpbWFnZTogd2ViaGlwcGllL2dvbGFuZzplZGdlCiAgICBwdWxsOiB0cnVlCiAgICBlbnZpcm9ubWVudDoKICAgICAgQ0dPX0VOQUJMRUQ6IDEKICAgICAgVEFHUzogc3FsaXRlIHRpZGIgcGFtCiAgICBjb21tYW5kczoKICAgICAgLSBhcGsgLVUgYWRkIGxpbnV4LXBhbS1kZXYgb3BlbnNzaC1jbGllbnQKICAgICAgLSBtYWtlIGNsZWFuCiAgICAgIC0gbWFrZSB2ZXQKICAgICAgLSBtYWtlIGxpbnQKICAgICAgLSBtYWtlIHRlc3QKICAgICAgLSBtYWtlIGJ1aWxkCiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoLCB0YWcsIHB1bGxfcmVxdWVzdCBdCgogIHRlc3QtbXlzcWw6CiAgICBpbWFnZTogd2ViaGlwcGllL2dvbGFuZzplZGdlCiAgICBwdWxsOiB0cnVlCiAgICBjb21tYW5kczoKICAgICAtIG1ha2UgdGVzdC1teXNxbAogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCBdCgogIHRlc3QtcGdzcWw6CiAgICBpbWFnZTogd2ViaGlwcGllL2dvbGFuZzplZGdlCiAgICBwdWxsOiB0cnVlCiAgICBjb21tYW5kczoKICAgICAtIG1ha2UgdGVzdC1wZ3NxbAogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCBdCgogIGNvdmVyYWdlOgogICAgaW1hZ2U6IHBsdWdpbnMvY292ZXJhZ2UKICAgIHNlcnZlcjogaHR0cHM6Ly9jb3ZlcmFnZS5naXRlYS5pbwogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCwgdGFnLCBwdWxsX3JlcXVlc3QgXQoKICB1cGRhdGVyOgogICAgaW1hZ2U6IGthcmFsYWJlL3hnby1sYXRlc3Q6bGF0ZXN0CiAgICBwdWxsOiB0cnVlCiAgICBjb21tYW5kczoKICAgICAgLSBtYWtlIHJlbGVhc2UKICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2gsIHRhZyBdCiAgICAgIGJyYW5jaDogWyBtYXN0ZXIsIHJlZnMvdGFncy8qIF0KCiAgZG9ja2VyOgogICAgaW1hZ2U6IHBsdWdpbnMvZG9ja2VyCiAgICByZXBvOiBnaXRlYS9naXRlYQogICAgdGFnczogWyAnJHtUQUd9JyBdCiAgICB3aGVuOgogICAgICBldmVudDogWyB0YWcgXQogICAgICBicmFuY2g6IFsgcmVmcy90YWdzLyogXQoKICBkb2NrZXI6CiAgICBpbWFnZTogcGx1Z2lucy9kb2NrZXIKICAgIHJlcG86IGdpdGVhL2dpdGVhCiAgICB0YWdzOiBbICdsYXRlc3QnIF0KICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2ggXQogICAgICBicmFuY2g6IFsgbWFzdGVyIF0KCiAgcmVsZWFzZToKICAgIGltYWdlOiBwbHVnaW5zL3MzCiAgICBwYXRoX3N0eWxlOiB0cnVlCiAgICBzdHJpcF9wcmVmaXg6IGRpc3QvcmVsZWFzZS8KICAgIHNvdXJjZTogZGlzdC9yZWxlYXNlLyoKICAgIHRhcmdldDogL2dpdGVhL21hc3RlcgogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCBdCiAgICAgIGJyYW5jaDogWyBtYXN0ZXIgXQoKICByZWxlYXNlOgogICAgaW1hZ2U6IHBsdWdpbnMvczMKICAgIHBhdGhfc3R5bGU6IHRydWUKICAgIHN0cmlwX3ByZWZpeDogZGlzdC9yZWxlYXNlLwogICAgc291cmNlOiBkaXN0L3JlbGVhc2UvKgogICAgdGFyZ2V0OiAvZ2l0ZWEvJCRUQUcKICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHRhZyBdCiAgICAgIGJyYW5jaDogWyByZWZzL3RhZ3MvKiBdCgogIGdpdGh1YjoKICAgIGltYWdlOiBwbHVnaW5zL2dpdGh1Yi1yZWxlYXNlCiAgICBmaWxlczoKICAgICAgLSBkaXN0L3JlbGVhc2UvKgogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgdGFnIF0KICAgICAgYnJhbmNoOiBbIHJlZnMvdGFncy8qIF0KCiAgZ2l0dGVyOgogICAgaW1hZ2U6IHBsdWdpbnMvZ2l0dGVyCgpzZXJ2aWNlczoKICBteXNxbDoKICAgIGltYWdlOiBteXNxbDo1LjcKICAgIGVudmlyb25tZW50OgogICAgICAtIE1ZU1FMX0RBVEFCQVNFPXRlc3QKICAgICAgLSBNWVNRTF9BTExPV19FTVBUWV9QQVNTV09SRD15ZXMKICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2ggXQoKICBwZ3NxbDoKICAgIGltYWdlOiBwb3N0Z3Jlczo5LjUKICAgIGVudmlyb25tZW50OgogICAgICAtIFBPU1RHUkVTX0RCPXRlc3QKICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2ggXQo.a1mdoQQXg8AeRSBiaebWDLkmLqNK-PDWEBN4QLKraak
+eyJhbGciOiJIUzI1NiJ9.d29ya3NwYWNlOgogIGJhc2U6IC9zcnYvYXBwCiAgcGF0aDogc3JjL2NvZGUuZ2l0ZWEuaW8vZ2l0ZWEKCnBpcGVsaW5lOgogIHRlc3Q6CiAgICBpbWFnZTogd2ViaGlwcGllL2dvbGFuZzplZGdlCiAgICBwdWxsOiB0cnVlCiAgICBlbnZpcm9ubWVudDoKICAgICAgQ0dPX0VOQUJMRUQ6IDEKICAgICAgVEFHUzogc3FsaXRlIGJpbmRhdGEKICAgICAgR09QQVRIOiAvc3J2L2FwcAogICAgY29tbWFuZHM6CiAgICAgIC0gYXBrIC1VIGFkZCBvcGVuc3NoLWNsaWVudAogICAgICAtIG1ha2UgY2xlYW4KICAgICAgLSBtYWtlIGdlbmVyYXRlCiAgICAgIC0gbWFrZSB2ZXQKICAgICAgLSBtYWtlIGxpbnQKICAgICAgLSBtYWtlIHRlc3QKICAgICAgLSBtYWtlIGJ1aWxkCiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoLCB0YWcsIHB1bGxfcmVxdWVzdCBdCgogIHRlc3QtbXlzcWw6CiAgICBpbWFnZTogd2ViaGlwcGllL2dvbGFuZzplZGdlCiAgICBwdWxsOiB0cnVlCiAgICBlbnZpcm9ubWVudDoKICAgICAgQ0dPX0VOQUJMRUQ6IDEKICAgICAgVEFHUzogc3FsaXRlIGJpbmRhdGEKICAgICAgR09QQVRIOiAvc3J2L2FwcAogICAgY29tbWFuZHM6CiAgICAgIC0gbWFrZSB0ZXN0LW15c3FsCiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoIF0KCiAgdGVzdC1wZ3NxbDoKICAgIGltYWdlOiB3ZWJoaXBwaWUvZ29sYW5nOmVkZ2UKICAgIHB1bGw6IHRydWUKICAgIGVudmlyb25tZW50OgogICAgICBDR09fRU5BQkxFRDogMQogICAgICBUQUdTOiBzcWxpdGUgYmluZGF0YQogICAgICBHT1BBVEg6IC9zcnYvYXBwCiAgICBjb21tYW5kczoKICAgICAgLSBtYWtlIHRlc3QtcGdzcWwKICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2ggXQoKICB1cGRhdGVyOgogICAgaW1hZ2U6IGthcmFsYWJlL3hnby1sYXRlc3Q6bGF0ZXN0CiAgICBwdWxsOiB0cnVlCiAgICBlbnZpcm9ubWVudDoKICAgICAgQ0dPX0VOQUJMRUQ6IDEKICAgICAgVEFHUzogc3FsaXRlIGJpbmRhdGEKICAgICAgR09QQVRIOiAvc3J2L2FwcAogICAgY29tbWFuZHM6CiAgICAgIC0gbWFrZSByZWxlYXNlCiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoLCB0YWcgXQogICAgICBicmFuY2g6IFsgbWFzdGVyLCByZWxlYXNlLyosIHJlZnMvdGFncy8qIF0KCiAgY292ZXJhZ2U6CiAgICBpbWFnZTogcGx1Z2lucy9jb3ZlcmFnZQogICAgc2VydmVyOiBodHRwczovL2NvdmVyYWdlLmdpdGVhLmlvCiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoLCB0YWcsIHB1bGxfcmVxdWVzdCBdCgogIGRvY2tlcjoKICAgIGltYWdlOiBwbHVnaW5zL2RvY2tlcgogICAgcmVwbzogZ2l0ZWEvZ2l0ZWEKICAgIHRhZ3M6IFsgJyR7RFJPTkVfVEFHIyN2fScgXQogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgdGFnIF0KICAgICAgYnJhbmNoOiBbIHJlZnMvdGFncy8qIF0KCiAgZG9ja2VyOgogICAgaW1hZ2U6IHBsdWdpbnMvZG9ja2VyCiAgICByZXBvOiBnaXRlYS9naXRlYQogICAgdGFnczogWyAnJHtEUk9ORV9CUkFOQ0gjI3JlbGVhc2Uvdn0nIF0KICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2ggXQogICAgICBicmFuY2g6IFsgcmVsZWFzZS8qIF0KCiAgZG9ja2VyOgogICAgaW1hZ2U6IHBsdWdpbnMvZG9ja2VyCiAgICByZXBvOiBnaXRlYS9naXRlYQogICAgdGFnczogWyAnbGF0ZXN0JyBdCiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoIF0KICAgICAgYnJhbmNoOiBbIG1hc3RlciBdCgogIHJlbGVhc2U6CiAgICBpbWFnZTogcGx1Z2lucy9zMwogICAgcGF0aF9zdHlsZTogdHJ1ZQogICAgc3RyaXBfcHJlZml4OiBkaXN0L3JlbGVhc2UvCiAgICBzb3VyY2U6IGRpc3QvcmVsZWFzZS8qCiAgICB0YXJnZXQ6IC9naXRlYS8ke0RST05FX1RBRyMjdn0KICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHRhZyBdCiAgICAgIGJyYW5jaDogWyByZWZzL3RhZ3MvKiBdCgogIHJlbGVhc2U6CiAgICBpbWFnZTogcGx1Z2lucy9zMwogICAgcGF0aF9zdHlsZTogdHJ1ZQogICAgc3RyaXBfcHJlZml4OiBkaXN0L3JlbGVhc2UvCiAgICBzb3VyY2U6IGRpc3QvcmVsZWFzZS8qCiAgICB0YXJnZXQ6IC9naXRlYS8ke0RST05FX0JSQU5DSCMjcmVsZWFzZS92fQogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCBdCiAgICAgIGJyYW5jaDogWyByZWxlYXNlLyogXQoKICByZWxlYXNlOgogICAgaW1hZ2U6IHBsdWdpbnMvczMKICAgIHBhdGhfc3R5bGU6IHRydWUKICAgIHN0cmlwX3ByZWZpeDogZGlzdC9yZWxlYXNlLwogICAgc291cmNlOiBkaXN0L3JlbGVhc2UvKgogICAgdGFyZ2V0OiAvZ2l0ZWEvbWFzdGVyCiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoIF0KICAgICAgYnJhbmNoOiBbIG1hc3RlciBdCgogIGdpdGh1YjoKICAgIGltYWdlOiBwbHVnaW5zL2dpdGh1Yi1yZWxlYXNlCiAgICBmaWxlczoKICAgICAgLSBkaXN0L3JlbGVhc2UvKgogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgdGFnIF0KICAgICAgYnJhbmNoOiBbIHJlZnMvdGFncy8qIF0KCiAgZ2l0dGVyOgogICAgaW1hZ2U6IHBsdWdpbnMvZ2l0dGVyCgpzZXJ2aWNlczoKICBteXNxbDoKICAgIGltYWdlOiBteXNxbDo1LjcKICAgIGVudmlyb25tZW50OgogICAgICAtIE1ZU1FMX0RBVEFCQVNFPXRlc3QKICAgICAgLSBNWVNRTF9BTExPV19FTVBUWV9QQVNTV09SRD15ZXMKICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2ggXQoKICBwZ3NxbDoKICAgIGltYWdlOiBwb3N0Z3Jlczo5LjUKICAgIGVudmlyb25tZW50OgogICAgICAtIFBPU1RHUkVTX0RCPXRlc3QKICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2ggXQo._4feZQfrP_lA1JxSLtj7CDpAN-uB4n4nJKR1R2UcxHg

.gitattributes

@@ -0,0 +1,6 @@
+conf/* linguist-vendored
+docker/* linguist-vendored
+options/* linguist-vendored
+public/* linguist-vendored
+scripts/* linguist-vendored
+templates/* linguist-vendored

.github/issue_template.md

@@ -12,6 +12,10 @@
  - [ ] PostgreSQL
  - [ ] MySQL
  - [ ] SQLite
+- Can you reproduce the bug at https://try.gitea.io:
+ - [ ] Yes (provide example URL)
+ - [ ] No
+ - [ ] Not relevant
 - Log gist:
 
 ## Description

.gitignore

@@ -28,7 +28,9 @@ _testmain.go
 
 coverage.out
 
+/modules/options/bindata.go
 /modules/public/bindata.go
+/modules/templates/bindata.go
 
 *.db
 *.log

CHANGELOG.md

@@ -0,0 +1,43 @@
+# Changelog
+
+## [1.0.0](https://github.com/go-gitea/gitea/releases/tag/v1.0.0) - 2016-12-23
+
+* BREAKING
+ * We have various changes on the API, scripting against API must be updated
+* FEATURE
+ * Show last login for admins [#121](https://github.com/go-gitea/gitea/pull/121)
+* BUGFIXES
+ * Fixed sender of notifications [#2](https://github.com/go-gitea/gitea/pull/2)
+ * Fixed keyword hijacking vulnerability [#20](https://github.com/go-gitea/gitea/pull/20)
+ * Fixed non-markdown readme rendering [#95](https://github.com/go-gitea/gitea/pull/95)
+ * Allow updating draft releases [#169](https://github.com/go-gitea/gitea/pull/169)
+ * GitHub API compliance [#227](https://github.com/go-gitea/gitea/pull/227)
+ * Added commit SHA to tag webhook [#286](https://github.com/go-gitea/gitea/issues/286)
+ * Secured links via noopener [#315](https://github.com/go-gitea/gitea/issues/315)
+ * Replace tabs with spaces on wiki title [#371](https://github.com/go-gitea/gitea/pull/371)
+ * Fixed vulnerability on labels and releases [#409](https://github.com/go-gitea/gitea/pull/409)
+ * Fixed issue comment API [#449](https://github.com/go-gitea/gitea/pull/449)
+* ENHANCEMENT
+ * Use proper import path for libravatar [#3](https://github.com/go-gitea/gitea/pull/3)
+ * Integrated DroneCI for tests and builds [#24](https://github.com/go-gitea/gitea/issues/24)
+ * Integrated dependency manager [#29](https://github.com/go-gitea/gitea/issues/29)
+ * Embedded bindata optionally [#30](https://github.com/go-gitea/gitea/issues/30)
+ * Integrated pagination for releases [#73](https://github.com/go-gitea/gitea/pull/73)
+ * Autogenerate version on every build [#91](https://github.com/go-gitea/gitea/issues/91)
+ * Refactored Docker container [#104](https://github.com/go-gitea/gitea/issues/104)
+ * Added short-hash support for downloads [#211](https://github.com/go-gitea/gitea/issues/211)
+ * Display tooltip for downloads [#221](https://github.com/go-gitea/gitea/issues/221)
+ * Improved HTTP headers for issue attachments [#270](https://github.com/go-gitea/gitea/pull/270)
+ * Integrate public as bindata optionally [#293](https://github.com/go-gitea/gitea/pull/293)
+ * Integrate templates as bindata optionally [#314](https://github.com/go-gitea/gitea/pull/314)
+ * Inject more ENV variables into custom hooks [#316](https://github.com/go-gitea/gitea/issues/316)
+ * Correct LDAP login validation [#342](https://github.com/go-gitea/gitea/pull/342)
+ * Integrate conf as bindata optionally [#354](https://github.com/go-gitea/gitea/pull/354)
+ * Serve video files in browser [#418](https://github.com/go-gitea/gitea/pull/418)
+ * Configurable SSH host binding [#431](https://github.com/go-gitea/gitea/issues/431)
+* MISC
+ * Forked from Gogs and renamed to Gitea
+ * Catching more errors with logs
+ * Fixed all linting errors
+ * Made the go linter entirely happy
+ * Really integrated vendoring