release notes for v1.1.4

* Fix deleted milestone bug

* Use locale for ghost milestone name

* Fix pointer bug

.drone.yml

@@ -19,23 +19,11 @@ pipeline:
       - make generate
       - make vet
       - make lint
-      - make test-vendor
       - make test
       - make build
     when:
       event: [ push, tag, pull_request ]
 
-  test-sqlite:
-    image: webhippie/golang:edge
-    pull: true
-    environment:
-      TAGS: bindata
-      GOPATH: /srv/app
-    commands:
-      - make test-sqlite
-    when:
-      event: [ push, tag, pull_request ]
-
   test-mysql:
     image: webhippie/golang:edge
     pull: true
@@ -43,7 +31,7 @@ pipeline:
       TAGS: bindata
       GOPATH: /srv/app
     commands:
-      - echo make test-mysql # Not ready yet
+      - make test-mysql
     when:
       event: [ push, tag, pull_request ]
 
@@ -54,7 +42,7 @@ pipeline:
       TAGS: bindata
       GOPATH: /srv/app
     commands:
-      - echo make test-pqsql # Not ready yet
+      - make test-pgsql
     when:
       event: [ push, tag, pull_request ]
 
@@ -69,11 +57,11 @@ pipeline:
     when:
       event: [ push, tag, pull_request ]
 
-  coverage:
-    image: plugins/coverage
-    server: https://coverage.gitea.io
-    when:
-      event: [ push, tag, pull_request ]
+  # coverage:
+  #   image: plugins/coverage
+  #   server: https://coverage.gitea.io
+  #   when:
+  #     event: [ push, tag, pull_request ]
 
   docker:
     image: plugins/docker

.drone.yml.sig

@@ -1 +1 @@
-eyJhbGciOiJIUzI1NiJ9.d29ya3NwYWNlOgogIGJhc2U6IC9zcnYvYXBwCiAgcGF0aDogc3JjL2NvZGUuZ2l0ZWEuaW8vZ2l0ZWEKCnBpcGVsaW5lOgogIGNsb25lOgogICAgaW1hZ2U6IHBsdWdpbnMvZ2l0CiAgICB0YWdzOiB0cnVlCgogIHRlc3Q6CiAgICBpbWFnZTogd2ViaGlwcGllL2dvbGFuZzplZGdlCiAgICBwdWxsOiB0cnVlCiAgICBlbnZpcm9ubWVudDoKICAgICAgVEFHUzogYmluZGF0YSBzcWxpdGUKICAgICAgR09QQVRIOiAvc3J2L2FwcAogICAgY29tbWFuZHM6CiAgICAgIC0gYXBrIC1VIGFkZCBvcGVuc3NoLWNsaWVudAogICAgICAtIG1ha2UgY2xlYW4KICAgICAgLSBtYWtlIGdlbmVyYXRlCiAgICAgIC0gbWFrZSB2ZXQKICAgICAgLSBtYWtlIGxpbnQKICAgICAgLSBtYWtlIHRlc3QtdmVuZG9yCiAgICAgIC0gbWFrZSB0ZXN0CiAgICAgIC0gbWFrZSBidWlsZAogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCwgdGFnLCBwdWxsX3JlcXVlc3QgXQoKICB0ZXN0LXNxbGl0ZToKICAgIGltYWdlOiB3ZWJoaXBwaWUvZ29sYW5nOmVkZ2UKICAgIHB1bGw6IHRydWUKICAgIGVudmlyb25tZW50OgogICAgICBUQUdTOiBiaW5kYXRhCiAgICAgIEdPUEFUSDogL3Nydi9hcHAKICAgIGNvbW1hbmRzOgogICAgICAtIG1ha2UgdGVzdC1zcWxpdGUKICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2gsIHRhZywgcHVsbF9yZXF1ZXN0IF0KCiAgdGVzdC1teXNxbDoKICAgIGltYWdlOiB3ZWJoaXBwaWUvZ29sYW5nOmVkZ2UKICAgIHB1bGw6IHRydWUKICAgIGVudmlyb25tZW50OgogICAgICBUQUdTOiBiaW5kYXRhCiAgICAgIEdPUEFUSDogL3Nydi9hcHAKICAgIGNvbW1hbmRzOgogICAgICAtIGVjaG8gbWFrZSB0ZXN0LW15c3FsICMgTm90IHJlYWR5IHlldAogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCwgdGFnLCBwdWxsX3JlcXVlc3QgXQoKICB0ZXN0LXBnc3FsOgogICAgaW1hZ2U6IHdlYmhpcHBpZS9nb2xhbmc6ZWRnZQogICAgcHVsbDogdHJ1ZQogICAgZW52aXJvbm1lbnQ6CiAgICAgIFRBR1M6IGJpbmRhdGEKICAgICAgR09QQVRIOiAvc3J2L2FwcAogICAgY29tbWFuZHM6CiAgICAgIC0gZWNobyBtYWtlIHRlc3QtcHFzcWwgIyBOb3QgcmVhZHkgeWV0CiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoLCB0YWcsIHB1bGxfcmVxdWVzdCBdCgogIHN0YXRpYzoKICAgIGltYWdlOiBrYXJhbGFiZS94Z28tbGF0ZXN0OmxhdGVzdAogICAgcHVsbDogdHJ1ZQogICAgZW52aXJvbm1lbnQ6CiAgICAgIFRBR1M6IGJpbmRhdGEgc3FsaXRlCiAgICAgIEdPUEFUSDogL3Nydi9hcHAKICAgIGNvbW1hbmRzOgogICAgICAtIG1ha2UgcmVsZWFzZQogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCwgdGFnLCBwdWxsX3JlcXVlc3QgXQoKICBjb3ZlcmFnZToKICAgIGltYWdlOiBwbHVnaW5zL2NvdmVyYWdlCiAgICBzZXJ2ZXI6IGh0dHBzOi8vY292ZXJhZ2UuZ2l0ZWEuaW8KICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2gsIHRhZywgcHVsbF9yZXF1ZXN0IF0KCiAgZG9ja2VyOgogICAgaW1hZ2U6IHBsdWdpbnMvZG9ja2VyCiAgICByZXBvOiBnaXRlYS9naXRlYQogICAgdGFnczogWyAnJHtEUk9ORV9UQUcjI3Z9JyBdCiAgICB3aGVuOgogICAgICBldmVudDogWyB0YWcgXQogICAgICBicmFuY2g6IFsgcmVmcy90YWdzLyogXQoKICBkb2NrZXI6CiAgICBpbWFnZTogcGx1Z2lucy9kb2NrZXIKICAgIHJlcG86IGdpdGVhL2dpdGVhCiAgICB0YWdzOiBbICcke0RST05FX0JSQU5DSCMjcmVsZWFzZS92fScgXQogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCBdCiAgICAgIGJyYW5jaDogWyByZWxlYXNlLyogXQoKICBkb2NrZXI6CiAgICBpbWFnZTogcGx1Z2lucy9kb2NrZXIKICAgIHJlcG86IGdpdGVhL2dpdGVhCiAgICB0YWdzOiBbICdsYXRlc3QnIF0KICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2ggXQogICAgICBicmFuY2g6IFsgbWFzdGVyIF0KCiAgcmVsZWFzZToKICAgIGltYWdlOiBwbHVnaW5zL3MzCiAgICBwYXRoX3N0eWxlOiB0cnVlCiAgICBzdHJpcF9wcmVmaXg6IGRpc3QvcmVsZWFzZS8KICAgIHNvdXJjZTogZGlzdC9yZWxlYXNlLyoKICAgIHRhcmdldDogL2dpdGVhLyR7RFJPTkVfVEFHIyN2fQogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgdGFnIF0KICAgICAgYnJhbmNoOiBbIHJlZnMvdGFncy8qIF0KCiAgcmVsZWFzZToKICAgIGltYWdlOiBwbHVnaW5zL3MzCiAgICBwYXRoX3N0eWxlOiB0cnVlCiAgICBzdHJpcF9wcmVmaXg6IGRpc3QvcmVsZWFzZS8KICAgIHNvdXJjZTogZGlzdC9yZWxlYXNlLyoKICAgIHRhcmdldDogL2dpdGVhLyR7RFJPTkVfQlJBTkNIIyNyZWxlYXNlL3Z9CiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoIF0KICAgICAgYnJhbmNoOiBbIHJlbGVhc2UvKiBdCgogIHJlbGVhc2U6CiAgICBpbWFnZTogcGx1Z2lucy9zMwogICAgcGF0aF9zdHlsZTogdHJ1ZQogICAgc3RyaXBfcHJlZml4OiBkaXN0L3JlbGVhc2UvCiAgICBzb3VyY2U6IGRpc3QvcmVsZWFzZS8qCiAgICB0YXJnZXQ6IC9naXRlYS9tYXN0ZXIKICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2ggXQogICAgICBicmFuY2g6IFsgbWFzdGVyIF0KCiAgZ2l0aHViOgogICAgaW1hZ2U6IHBsdWdpbnMvZ2l0aHViLXJlbGVhc2UKICAgIGZpbGVzOgogICAgICAtIGRpc3QvcmVsZWFzZS8qCiAgICB3aGVuOgogICAgICBldmVudDogWyB0YWcgXQogICAgICBicmFuY2g6IFsgcmVmcy90YWdzLyogXQoKICBnaXR0ZXI6CiAgICBpbWFnZTogcGx1Z2lucy9naXR0ZXIKCnNlcnZpY2VzOgogIG15c3FsOgogICAgaW1hZ2U6IG15c3FsOjUuNwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gTVlTUUxfREFUQUJBU0U9dGVzdAogICAgICAtIE1ZU1FMX0FMTE9XX0VNUFRZX1BBU1NXT1JEPXllcwogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCwgdGFnLCBwdWxsX3JlcXVlc3QgXQoKICBwZ3NxbDoKICAgIGltYWdlOiBwb3N0Z3Jlczo5LjUKICAgIGVudmlyb25tZW50OgogICAgICAtIFBPU1RHUkVTX0RCPXRlc3QKICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2gsIHRhZywgcHVsbF9yZXF1ZXN0IF0K.dA2VK6LdoPXvBTYAUywWervhOZmgOjU32uiiPrBbVdQ
+eyJhbGciOiJIUzI1NiJ9.d29ya3NwYWNlOgogIGJhc2U6IC9zcnYvYXBwCiAgcGF0aDogc3JjL2NvZGUuZ2l0ZWEuaW8vZ2l0ZWEKCnBpcGVsaW5lOgogIGNsb25lOgogICAgaW1hZ2U6IHBsdWdpbnMvZ2l0CiAgICB0YWdzOiB0cnVlCgogIHRlc3Q6CiAgICBpbWFnZTogd2ViaGlwcGllL2dvbGFuZzplZGdlCiAgICBwdWxsOiB0cnVlCiAgICBlbnZpcm9ubWVudDoKICAgICAgVEFHUzogYmluZGF0YSBzcWxpdGUKICAgICAgR09QQVRIOiAvc3J2L2FwcAogICAgY29tbWFuZHM6CiAgICAgIC0gYXBrIC1VIGFkZCBvcGVuc3NoLWNsaWVudAogICAgICAtIG1ha2UgY2xlYW4KICAgICAgLSBtYWtlIGdlbmVyYXRlCiAgICAgIC0gbWFrZSB2ZXQKICAgICAgLSBtYWtlIGxpbnQKICAgICAgLSBtYWtlIHRlc3QKICAgICAgLSBtYWtlIGJ1aWxkCiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoLCB0YWcsIHB1bGxfcmVxdWVzdCBdCgogIHRlc3QtbXlzcWw6CiAgICBpbWFnZTogd2ViaGlwcGllL2dvbGFuZzplZGdlCiAgICBwdWxsOiB0cnVlCiAgICBlbnZpcm9ubWVudDoKICAgICAgVEFHUzogYmluZGF0YQogICAgICBHT1BBVEg6IC9zcnYvYXBwCiAgICBjb21tYW5kczoKICAgICAgLSBtYWtlIHRlc3QtbXlzcWwKICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2gsIHRhZywgcHVsbF9yZXF1ZXN0IF0KCiAgdGVzdC1wZ3NxbDoKICAgIGltYWdlOiB3ZWJoaXBwaWUvZ29sYW5nOmVkZ2UKICAgIHB1bGw6IHRydWUKICAgIGVudmlyb25tZW50OgogICAgICBUQUdTOiBiaW5kYXRhCiAgICAgIEdPUEFUSDogL3Nydi9hcHAKICAgIGNvbW1hbmRzOgogICAgICAtIG1ha2UgdGVzdC1wZ3NxbAogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCwgdGFnLCBwdWxsX3JlcXVlc3QgXQoKICBzdGF0aWM6CiAgICBpbWFnZToga2FyYWxhYmUveGdvLWxhdGVzdDpsYXRlc3QKICAgIHB1bGw6IHRydWUKICAgIGVudmlyb25tZW50OgogICAgICBUQUdTOiBiaW5kYXRhIHNxbGl0ZQogICAgICBHT1BBVEg6IC9zcnYvYXBwCiAgICBjb21tYW5kczoKICAgICAgLSBtYWtlIHJlbGVhc2UKICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2gsIHRhZywgcHVsbF9yZXF1ZXN0IF0KCiAgIyBjb3ZlcmFnZToKICAjICAgaW1hZ2U6IHBsdWdpbnMvY292ZXJhZ2UKICAjICAgc2VydmVyOiBodHRwczovL2NvdmVyYWdlLmdpdGVhLmlvCiAgIyAgIHdoZW46CiAgIyAgICAgZXZlbnQ6IFsgcHVzaCwgdGFnLCBwdWxsX3JlcXVlc3QgXQoKICBkb2NrZXI6CiAgICBpbWFnZTogcGx1Z2lucy9kb2NrZXIKICAgIHJlcG86IGdpdGVhL2dpdGVhCiAgICB0YWdzOiBbICcke0RST05FX1RBRyMjdn0nIF0KICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHRhZyBdCiAgICAgIGJyYW5jaDogWyByZWZzL3RhZ3MvKiBdCgogIGRvY2tlcjoKICAgIGltYWdlOiBwbHVnaW5zL2RvY2tlcgogICAgcmVwbzogZ2l0ZWEvZ2l0ZWEKICAgIHRhZ3M6IFsgJyR7RFJPTkVfQlJBTkNIIyNyZWxlYXNlL3Z9JyBdCiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoIF0KICAgICAgYnJhbmNoOiBbIHJlbGVhc2UvKiBdCgogIGRvY2tlcjoKICAgIGltYWdlOiBwbHVnaW5zL2RvY2tlcgogICAgcmVwbzogZ2l0ZWEvZ2l0ZWEKICAgIHRhZ3M6IFsgJ2xhdGVzdCcgXQogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCBdCiAgICAgIGJyYW5jaDogWyBtYXN0ZXIgXQoKICByZWxlYXNlOgogICAgaW1hZ2U6IHBsdWdpbnMvczMKICAgIHBhdGhfc3R5bGU6IHRydWUKICAgIHN0cmlwX3ByZWZpeDogZGlzdC9yZWxlYXNlLwogICAgc291cmNlOiBkaXN0L3JlbGVhc2UvKgogICAgdGFyZ2V0OiAvZ2l0ZWEvJHtEUk9ORV9UQUcjI3Z9CiAgICB3aGVuOgogICAgICBldmVudDogWyB0YWcgXQogICAgICBicmFuY2g6IFsgcmVmcy90YWdzLyogXQoKICByZWxlYXNlOgogICAgaW1hZ2U6IHBsdWdpbnMvczMKICAgIHBhdGhfc3R5bGU6IHRydWUKICAgIHN0cmlwX3ByZWZpeDogZGlzdC9yZWxlYXNlLwogICAgc291cmNlOiBkaXN0L3JlbGVhc2UvKgogICAgdGFyZ2V0OiAvZ2l0ZWEvJHtEUk9ORV9CUkFOQ0gjI3JlbGVhc2Uvdn0KICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2ggXQogICAgICBicmFuY2g6IFsgcmVsZWFzZS8qIF0KCiAgcmVsZWFzZToKICAgIGltYWdlOiBwbHVnaW5zL3MzCiAgICBwYXRoX3N0eWxlOiB0cnVlCiAgICBzdHJpcF9wcmVmaXg6IGRpc3QvcmVsZWFzZS8KICAgIHNvdXJjZTogZGlzdC9yZWxlYXNlLyoKICAgIHRhcmdldDogL2dpdGVhL21hc3RlcgogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCBdCiAgICAgIGJyYW5jaDogWyBtYXN0ZXIgXQoKICBnaXRodWI6CiAgICBpbWFnZTogcGx1Z2lucy9naXRodWItcmVsZWFzZQogICAgZmlsZXM6CiAgICAgIC0gZGlzdC9yZWxlYXNlLyoKICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHRhZyBdCiAgICAgIGJyYW5jaDogWyByZWZzL3RhZ3MvKiBdCgogIGdpdHRlcjoKICAgIGltYWdlOiBwbHVnaW5zL2dpdHRlcgoKc2VydmljZXM6CiAgbXlzcWw6CiAgICBpbWFnZTogbXlzcWw6NS43CiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBNWVNRTF9EQVRBQkFTRT10ZXN0CiAgICAgIC0gTVlTUUxfQUxMT1dfRU1QVFlfUEFTU1dPUkQ9eWVzCiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoLCB0YWcsIHB1bGxfcmVxdWVzdCBdCgogIHBnc3FsOgogICAgaW1hZ2U6IHBvc3RncmVzOjkuNQogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gUE9TVEdSRVNfREI9dGVzdAogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCwgdGFnLCBwdWxsX3JlcXVlc3QgXQo.uf02h57dWfCrxG3rcNcYlZPQP2XsFhKvcF2geGTpG50

.github/issue_template.md

@@ -11,7 +11,6 @@
 - Database (use `[x]`):
   - [ ] PostgreSQL
   - [ ] MySQL
-  - [ ] MSSQL
   - [ ] SQLite
 - Can you reproduce the bug at https://try.gitea.io:
   - [ ] Yes (provide example URL)

.gitignore

@@ -36,7 +36,6 @@ coverage.out
 *.log
 
 /gitea
-/integrations.test
 
 /bin
 /dist
@@ -45,4 +44,3 @@ coverage.out
 /indexers
 /log
 /public/img/avatar
-/integrations/gitea-integration

CHANGELOG.md

@@ -1,11 +1,47 @@
 # Changelog
 
-## Unreleased
+## [1.1.4](https://github.com/go-gitea/gitea/releases/tag/v1.1.4) - 2017-09-04
 
-* BREAKING
-  * Password reset URL changed from `/user/forget_password` to `/user/forgot_password`
-  * SSH keys management URL changed from `/user/settings/ssh` to `/user/settings/keys`
+* BUGFIXES
+  * Fix rendering of external links (#2292) (#2315)
+  * Fix deleted milestone bug (#1942) (#2300)
+  * fix 500 error when view an issue which's milestone deleted (#2297) (#2299)
+  * Fix SHA1 hash linking (#2143) (#2293)
+  * back port from #1709 (#2291)
 
+## [1.1.3](https://github.com/go-gitea/gitea/releases/tag/v1.1.3) - 2017-08-03
+
+* BUGFIXES
+  * Fix PR template error (#2008)
+  * Fix markdown rendering (fix #1530) (#2043)
+  * Fix missing less sources for oauth (backport #1288) (#2135)
+  * Don't ignore gravatar error (#2138)
+  * Fix diff of renamed and modified file (#2136)
+  * Fix fast-forward PR bug (#2137)
+  * Fix some security bugs
+
+## [1.1.2](https://github.com/go-gitea/gitea/releases/tag/v1.1.2) - 2017-06-13
+
+* BUGFIXES
+  * Enforce netgo build tag while cross-compilation (Backport of #1690) (#1731)
+  * fix update avatar
+  * fix delete user failed on sqlite (#1321)
+  * fix bug not to trim space of login username (#1806)
+  * Backport bugfixes #1220 and #1393 to v1.1 (#1758)
+
+## [1.1.1](https://github.com/go-gitea/gitea/releases/tag/v1.1.1) - 2017-05-04
+
+* BUGFIXES
+  * Markdown Sanitation Fix [#1646](https://github.com/go-gitea/gitea/pull/1646)
+  * Fix broken hooks [#1376](https://github.com/go-gitea/gitea/pull/1376)
+  * Fix migration issue [#1375](https://github.com/go-gitea/gitea/pull/1375)
+  * Fix Wiki Issues [#1338](https://github.com/go-gitea/gitea/pull/1338)
+  * Forgotten migration for wiki githooks [#1237](https://github.com/go-gitea/gitea/pull/1237)
+  * Commit messages can contain pipes [#1218](https://github.com/go-gitea/gitea/pull/1218)
+  * Verify external tracker URLs [#1236](https://github.com/go-gitea/gitea/pull/1236)
+  * Allow upgrade after downgrade [#1197](https://github.com/go-gitea/gitea/pull/1197)
+  * 500 on delete repo with issue [#1195](https://github.com/go-gitea/gitea/pull/1195)
+  * INI compat with CrowdIn [#1192](https://github.com/go-gitea/gitea/pull/1192)
 
 ## [1.1.0](https://github.com/go-gitea/gitea/releases/tag/v1.1.0) - 2017-03-09
 
@@ -79,7 +115,7 @@
   * Added option to config to disable local path imports [#724](https://github.com/go-gitea/gitea/pull/724)
   * Allow custom public files [#782](https://github.com/go-gitea/gitea/pull/782)
   * Added pprof endpoint for debugging [#801](https://github.com/go-gitea/gitea/pull/801)
-  * Added `X-GitHub-*` headers [#809](https://github.com/go-gitea/gitea/pull/809)
+  * Added X-GitHub-* headers [#809](https://github.com/go-gitea/gitea/pull/809)
   * Fill SSH key title automatically [#863](https://github.com/go-gitea/gitea/pull/863)
   * Display Git version on admin panel [#921](https://github.com/go-gitea/gitea/pull/921)
   * Expose URL field on issue API [#982](https://github.com/go-gitea/gitea/pull/982)
@@ -111,7 +147,7 @@
 ## [1.0.1](https://github.com/go-gitea/gitea/releases/tag/v1.0.1) - 2017-01-05
 
 * BUGFIXES
-  * Fixed localized `MIN_PASSWORD_LENGTH` [#501](https://github.com/go-gitea/gitea/pull/501)
+  * Fixed localized MIN_PASSWORD_LENGTH [#501](https://github.com/go-gitea/gitea/pull/501)
   * Fixed 500 error on organization delete [#507](https://github.com/go-gitea/gitea/pull/507)
   * Ignore empty wiki repo on migrate [#544](https://github.com/go-gitea/gitea/pull/544)
   * Proper check access for forking [#563](https://github.com/go-gitea/gitea/pull/563)

CONTRIBUTING.md

@@ -81,7 +81,7 @@ The current release cycle is aligned to start on December 25 to February 24, nex
 
 ## Maintainers
 
-To make sure every PR is checked, we have [team maintainers](MAINTAINERS). Every PR **MUST** be reviewed by at least two maintainers (or owners) before it can get merged. A maintainer should be a contributor of Gitea (or Gogs) and contributed at least 4 accepted PRs. A contributor should apply as a maintainer in the [Gitter develop channel](https://gitter.im/go-gitea/develop). The owners or the team maintainers may invite the contributor. A maintainer should spend some time on code reviews. If a maintainer has no time to do that, they should apply to leave the maintainers team and we will give them the honor of being a member of the [advisors team](https://github.com/orgs/go-gitea/teams/advisors). Of course, if an advisor has time to code review, we will gladly welcome them back to the maintainers team. If a maintainer is inactive for more than 3 months and forgets to leave the maintainers team, the owners may move him or her from the maintainers team to the advisors team.
+To make sure every PR is checked, we have [team maintainers](https://github.com/orgs/go-gitea/teams/maintainers). Every PR **MUST** be reviewed by at least two maintainers (or owners) before it can get merged. A maintainer should be a contributor of Gitea (or Gogs) and contributed at least 4 accepted PRs. A contributor should apply as a maintainer in the [Gitter develop channel](https://gitter.im/go-gitea/develop). The owners or the team maintainers may invite the contributor. A maintainer should spend some time on code reviews. If a maintainer has no time to do that, they should apply to leave the maintainers team and we will give them the honor of being a member of the [advisors team](https://github.com/orgs/go-gitea/teams/advisors). Of course, if an advisor has time to code review, we will gladly welcome them back to the maintainers team. If a maintainer is inactive for more than 3 months and forgets to leave the maintainers team, the owners may move him or her from the maintainers team to the advisors team.
 
 ## Owners
 

Dockerfile.aarch64

@@ -1,43 +0,0 @@
-FROM aarch64/alpine:3.5
-
-EXPOSE 22 3000
-
-RUN apk update && \
-  apk add \
-    su-exec \
-    ca-certificates \
-    sqlite \
-    bash \
-    git \
-    linux-pam \
-    s6 \
-    curl \
-    openssh \
-    tzdata && \
-  rm -rf \
-    /var/cache/apk/* && \
-  addgroup \
-    -S -g 1000 \
-    git && \
-  adduser \
-    -S -H -D \
-    -h /data/git \
-    -s /bin/bash \
-    -u 1000 \
-    -G git \
-    git && \
-  echo "git:$(date +%s | sha256sum | base64 | head -c 32)" | chpasswd
-
-ENV USER git
-ENV GITEA_CUSTOM /data/gitea
-
-COPY docker /
-COPY gitea /app/gitea/gitea
-
-ENV GODEBUG=netdns=go
-
-VOLUME ["/data"]
-
-ENTRYPOINT ["/usr/bin/entrypoint"]
-CMD ["/bin/s6-svscan", "/etc/s6"]
-

MAINTAINERS

@@ -12,5 +12,3 @@ Rémy Boulanouar <admin@dblk.org> (@DblK)
 Sandro Santilli <strk@kbt.io> (@strk)
 Thibault Meyer <meyer.thibault@gmail.com> (@0xbaadf00d)
 Thomas Boerger <thomas@webhippie.de> (@tboerger)
-Patrick G <geek1011@outlook.com> (@geek1011)
-Antoine Girard <sapk@sapk.fr> (@sapk)

Makefile

@@ -11,12 +11,7 @@ BINDATA := modules/{options,public,templates}/bindata.go
 STYLESHEETS := $(wildcard public/less/index.less public/less/_*.less)
 JAVASCRIPTS :=
 
-GOFLAGS := -i -v
-EXTRA_GOFLAGS ?=
-
-VERSION := $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')
-
-LDFLAGS := -X "main.Version=$(VERSION)" -X "main.Tags=$(TAGS)"
+LDFLAGS := -X "main.Version=$(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')" -X "main.Tags=$(TAGS)"
 
 PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations,$(shell go list ./... | grep -v /vendor/))
 SOURCES ?= $(shell find . -name "*.go" -type f)
@@ -79,28 +74,13 @@ integrations: build
 test:
 	for PKG in $(PACKAGES); do go test -cover -coverprofile $$GOPATH/src/$$PKG/coverage.out $$PKG || exit 1; done;
 
-.PHONY: test-vendor
-test-vendor:
-	@hash govendor > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
-		go get -u github.com/kardianos/govendor; \
-	fi
-	govendor status +outside +unused  || exit 1
-
-.PHONY: test-sqlite
-test-sqlite: integrations.test
-	GITEA_CONF=integrations/sqlite.ini ./integrations.test
-
 .PHONY: test-mysql
-test-mysql: integrations.test
-	echo "CREATE DATABASE IF NOT EXISTS testgitea" | mysql -u root
-	GITEA_CONF=integrations/mysql.ini ./integrations.test
+test-mysql:
+	@echo "Not integrated yet!"
 
 .PHONY: test-pgsql
-test-pgsql: integrations.test
-	GITEA_CONF=integrations/pgsql.ini ./integrations.test
-
-integrations.test: $(SOURCES)
-	go test -c code.gitea.io/gitea/integrations -tags 'sqlite'
+test-pgsql:
+	@echo "Not integrated yet!"
 
 .PHONY: check
 check: test
@@ -113,7 +93,7 @@ install: $(wildcard *.go)
 build: $(EXECUTABLE)
 
 $(EXECUTABLE): $(SOURCES)
-	go build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@
+	go build -i -v -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@
 
 .PHONY: docker
 docker:
@@ -132,7 +112,7 @@ release-windows:
 	@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
 		go get -u github.com/karalabe/xgo; \
 	fi
-	xgo -dest $(DIST)/binaries -tags '$(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out gitea-$(VERSION) .
+	xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out gitea-$(VERSION) .
 ifeq ($(CI),drone)
 	mv /build/* $(DIST)/binaries
 endif
@@ -142,7 +122,7 @@ release-linux:
 	@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
 		go get -u github.com/karalabe/xgo; \
 	fi
-	xgo -dest $(DIST)/binaries -tags '$(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'linux/*' -out gitea-$(VERSION) .
+	xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'linux/*' -out gitea-$(VERSION) .
 ifeq ($(CI),drone)
 	mv /build/* $(DIST)/binaries
 endif
@@ -152,7 +132,7 @@ release-darwin:
 	@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
 		go get -u github.com/karalabe/xgo; \
 	fi
-	xgo -dest $(DIST)/binaries -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -targets 'darwin/*' -out gitea-$(VERSION) .
+	xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '$(LDFLAGS)' -targets 'darwin/*' -out gitea-$(VERSION) .
 ifeq ($(CI),drone)
 	mv /build/* $(DIST)/binaries
 endif

README.md

@@ -10,11 +10,12 @@
 [![GoDoc](https://godoc.org/code.gitea.io/gitea?status.svg)](https://godoc.org/code.gitea.io/gitea)
 [![Release](https://github-release-version.herokuapp.com/github/go-gitea/gitea/release.svg?style=flat)](https://github.com/go-gitea/gitea/releases/latest)
 
-| | | |
-|:---:|:---:|:---:|
+||||
+|:-------------:|:-------:|:-------:|
 |![Dashboard](https://i.imgur.com/3iEQsux.jpg)|![Repository](https://i.imgur.com/glqFnj8.jpg)|![Commits History](https://i.imgur.com/ad1FEpi.jpg)|
 |![Profile](https://i.imgur.com/q81EcGa.jpg)|![Admin Dashboard](https://i.imgur.com/L2CQeN0.jpg)|![Diff](https://i.imgur.com/cNuvMum.jpg)|
 |![Issues](https://i.imgur.com/xCYRqaF.jpg)|![Releases](https://i.imgur.com/ILpRBCe.jpg)|![Organization](https://i.imgur.com/0BHnrcL.jpg)|
+||||
 
 ## Purpose
 

README_ZH.md

@@ -10,11 +10,12 @@
 [![GoDoc](https://godoc.org/code.gitea.io/gitea?status.svg)](https://godoc.org/code.gitea.io/gitea)
 [![Release](https://github-release-version.herokuapp.com/github/go-gitea/gitea/release.svg?style=flat)](https://github.com/go-gitea/gitea/releases/latest)
 
-| | | |
-|:---:|:---:|:---:|
+||||
+|:-------------:|:-------:|:-------:|
 |![Dashboard](https://i.imgur.com/3iEQsux.jpg)|![Repository](https://i.imgur.com/glqFnj8.jpg)|![Commits History](https://i.imgur.com/ad1FEpi.jpg)|
 |![Profile](https://i.imgur.com/q81EcGa.jpg)|![Admin Dashboard](https://i.imgur.com/L2CQeN0.jpg)|![Diff](https://i.imgur.com/cNuvMum.jpg)|
 |![Issues](https://i.imgur.com/xCYRqaF.jpg)|![Releases](https://i.imgur.com/ILpRBCe.jpg)|![Organization](https://i.imgur.com/0BHnrcL.jpg)|
+||||
 
 ## 目标
 

changelog/unreleased/restore-backup.yml

@@ -1,3 +0,0 @@
-title: Implement proper `gitea restore` & `gitea backup`. Deprecating `gitea dump`
-kind: feature
-pull_request: 1637

cmd/admin.go

@@ -8,10 +8,10 @@ package cmd
 import (
 	"fmt"
 
+	"github.com/urfave/cli"
+
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/setting"
-
-	"github.com/urfave/cli"
 )
 
 var (
@@ -23,7 +23,6 @@ var (
 to make automatic initialization process more smoothly`,
 		Subcommands: []cli.Command{
 			subcmdCreateUser,
-			subcmdChangePassword,
 		},
 	}
 
@@ -58,59 +57,8 @@ to make automatic initialization process more smoothly`,
 			},
 		},
 	}
-
-	subcmdChangePassword = cli.Command{
-		Name:   "change-password",
-		Usage:  "Change a user's password",
-		Action: runChangePassword,
-		Flags: []cli.Flag{
-			cli.StringFlag{
-				Name:  "username,u",
-				Value: "",
-				Usage: "The user to change password for",
-			},
-			cli.StringFlag{
-				Name:  "password,p",
-				Value: "",
-				Usage: "New password to set for user",
-			},
-		},
-	}
 )
 
-func runChangePassword(c *cli.Context) error {
-	if !c.IsSet("password") {
-		return fmt.Errorf("Password is not specified")
-	} else if !c.IsSet("username") {
-		return fmt.Errorf("Username is not specified")
-	}
-
-	setting.NewContext()
-	models.LoadConfigs()
-
-	setting.NewXORMLogService(false)
-	if err := models.SetEngine(); err != nil {
-		return fmt.Errorf("models.SetEngine: %v", err)
-	}
-
-	uname := c.String("username")
-	user, err := models.GetUserByName(uname)
-	if err != nil {
-		return fmt.Errorf("%v", err)
-	}
-	user.Passwd = c.String("password")
-	if user.Salt, err = models.GetUserSalt(); err != nil {
-		return fmt.Errorf("%v", err)
-	}
-	user.EncodePasswd()
-	if err := models.UpdateUser(user); err != nil {
-		return fmt.Errorf("%v", err)
-	}
-
-	fmt.Printf("User '%s' password has been successfully updated!\n", uname)
-	return nil
-}
-
 func runCreateUser(c *cli.Context) error {
 	if !c.IsSet("name") {
 		return fmt.Errorf("Username is not specified")

cmd/backup.go

@@ -1,197 +0,0 @@
-// Copyright 2017 the Gitea Authors. All rights reserved.
-// Copyright 2017 The Gogs Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package cmd
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
-	"runtime/debug"
-	"time"
-
-	"github.com/Unknwon/cae/zip"
-	"github.com/Unknwon/com"
-	"github.com/urfave/cli"
-	"gopkg.in/ini.v1"
-
-	"code.gitea.io/gitea/models"
-	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/modules/setting"
-)
-
-// Backup files and database
-var Backup = cli.Command{
-	Name:  "backup",
-	Usage: "Backup files and database",
-	Description: `Backup dumps and compresses all related files and database into zip file,
-   which can be used for migrating Gitea to another server. The output format is meant to be
-   portable among all supported database engines.`,
-	Action: runBackup,
-	Flags: []cli.Flag{
-		cli.StringFlag{
-			Name:  "config, c",
-			Value: "custom/conf/app.ini",
-			Usage: "Custom configuration `FILE` path",
-		},
-		cli.StringFlag{
-			Name:  "tempdir, t",
-			Value: os.TempDir(),
-			Usage: "Temporary directory `PATH`",
-		},
-		cli.StringFlag{
-			Name:  "target",
-			Value: "./",
-			Usage: "Target directory `PATH` to save backup archive",
-		},
-		cli.BoolFlag{
-			Name:  "verbose, v",
-			Usage: "Show process details",
-		},
-		cli.BoolTFlag{
-			Name:  "db",
-			Usage: "Backup the database (default: true)",
-		},
-		cli.BoolTFlag{
-			Name:  "repos",
-			Usage: "Backup repositories (default: true)",
-		},
-		cli.BoolTFlag{
-			Name:  "data",
-			Usage: "Backup attachments and avatars (default: true)",
-		},
-		cli.BoolTFlag{
-			Name:  "custom",
-			Usage: "Backup custom files (default: true)",
-		},
-	},
-}
-
-const (
-	archiveRootDir = "gitea-backup"
-	backupVersion  = 1
-)
-
-func runBackup(c *cli.Context) error {
-	zip.Verbose = c.Bool("verbose")
-	if c.IsSet("config") {
-		setting.CustomConf = c.String("config")
-	}
-	setting.NewContext()
-	models.LoadConfigs()
-	if err := models.SetEngine(); err != nil {
-		return err
-	}
-
-	// Setup temp-dir
-	tmpDir := c.String("tempdir")
-	if !com.IsExist(tmpDir) {
-		log.Fatal(0, "'--tempdir' does not exist: %s", tmpDir)
-	}
-	rootDir, err := ioutil.TempDir(tmpDir, "gitea-backup-")
-	if err != nil {
-		log.Fatal(0, "Fail to create backup root directory '%s': %v", rootDir, err)
-	}
-	defer func(rootDir string) {
-		os.RemoveAll(rootDir)
-	}(rootDir)
-	log.Info("Backup root directory: %s", rootDir)
-
-	// Metadata
-	metaFile := path.Join(rootDir, "metadata.ini")
-	metadata := ini.Empty()
-	metadata.Section("").Key("VERSION").SetValue(fmt.Sprintf("%d", backupVersion))
-	metadata.Section("").Key("DATE_TIME").SetValue(time.Now().String())
-	metadata.Section("").Key("GITEA_VERSION").SetValue(setting.AppVer)
-	if err = metadata.SaveTo(metaFile); err != nil {
-		log.Fatal(0, "Fail to save metadata '%s': %v", metaFile, err)
-	}
-
-	// Create ZIP-file
-	archiveName := path.Join(c.String("target"), fmt.Sprintf("gitea-backup-%d.zip", time.Now().Unix()))
-	log.Info("Packing backup files to: %s", archiveName)
-
-	z, err := zip.Create(archiveName)
-	if err != nil {
-		log.Fatal(0, "Fail to create backup archive '%s': %v", archiveName, err)
-	}
-	defer func(archiveName string) {
-		if r := recover(); r != nil {
-			var ok bool
-			err, ok = r.(error)
-			if !ok {
-				err = fmt.Errorf("pkg: %v", r)
-			}
-			debug.PrintStack()
-			log.Info("Removing partial backup-file %s\n", archiveName)
-			os.Remove(archiveName)
-			log.Fatal(9, "%v\n", err)
-		}
-	}(archiveName)
-
-	// Add metadata-file
-	if err = z.AddFile(archiveRootDir+"/metadata.ini", metaFile); err != nil {
-		log.Fatal(0, "Fail to include 'metadata.ini': %v", err)
-	}
-
-	// Database
-	if c.Bool("db") {
-		log.Info("Backing up database")
-		dbDir := path.Join(rootDir, "db")
-		if err = models.DumpDatabase(dbDir); err != nil {
-			log.Fatal(0, "Fail to dump database: %v", err)
-		}
-		if err = z.AddDir(archiveRootDir+"/db", dbDir); err != nil {
-			log.Fatal(0, "Fail to include 'db': %v", err)
-		}
-	}
-
-	// Custom files
-	if c.Bool("custom") {
-		log.Info("Backing up custom files")
-		if err = z.AddDir(archiveRootDir+"/custom", setting.CustomPath); err != nil {
-			log.Fatal(0, "Fail to include 'custom': %v", err)
-		}
-	}
-
-	// Data files
-	if c.Bool("data") {
-		log.Info("Backing up attachments and avatars")
-		for _, dir := range []string{"attachments", "avatars"} {
-			dirPath := path.Join(setting.AppDataPath, dir)
-			if !com.IsDir(dirPath) {
-				continue
-			}
-
-			if err = z.AddDir(path.Join(archiveRootDir+"/data", dir), dirPath); err != nil {
-				log.Fatal(0, "Fail to include 'data': %v", err)
-			}
-		}
-	}
-
-	// Repositories
-	if c.Bool("repos") {
-		log.Info("Backing up repositories")
-		reposDump := path.Join(rootDir, "repositories.zip")
-		log.Info("Dumping repositories in '%s'", setting.RepoRootPath)
-		if err = zip.PackTo(setting.RepoRootPath, reposDump, true); err != nil {
-			log.Fatal(0, "Fail to dump repositories: %v", err)
-		}
-		log.Info("Repositories dumped to: %s", reposDump)
-
-		if err = z.AddFile(archiveRootDir+"/repositories.zip", reposDump); err != nil {
-			log.Fatal(0, "Fail to include 'repositories.zip': %v", err)
-		}
-	}
-
-	if err = z.Close(); err != nil {
-		log.Fatal(0, "Fail to save backup archive '%s': %v", archiveName, err)
-	}
-
-	os.RemoveAll(rootDir)
-	log.Info("Backup succeed! Archive is located at: %s", archiveName)
-	return nil
-}

cmd/dump.go

@@ -8,24 +8,23 @@ package cmd
 import (
 	"fmt"
 	"io/ioutil"
+	"log"
 	"os"
 	"path"
 	"path/filepath"
 	"time"
 
 	"code.gitea.io/gitea/models"
-	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
-
 	"github.com/Unknwon/cae/zip"
 	"github.com/Unknwon/com"
 	"github.com/urfave/cli"
 )
 
-// Dump represents the available dump sub-command.
-var Dump = cli.Command{
+// CmdDump represents the available dump sub-command.
+var CmdDump = cli.Command{
 	Name:  "dump",
-	Usage: "DEPRICATED! Dump Gitea files and database",
+	Usage: "Dump Gitea files and database",
 	Description: `Dump compresses all related files and database into zip file.
 It can be used for backup and capture Gitea server image to send to maintainer`,
 	Action: runDump,
@@ -59,66 +58,65 @@ func runDump(ctx *cli.Context) error {
 	setting.NewServices() // cannot access session settings otherwise
 	models.LoadConfigs()
 
-	log.Info("")
-
-	if err := models.SetEngine(); err != nil {
+	err := models.SetEngine()
+	if err != nil {
 		return err
 	}
 
 	tmpDir := ctx.String("tempdir")
 	if _, err := os.Stat(tmpDir); os.IsNotExist(err) {
-		log.Fatal(4, "Path does not exist: %s", tmpDir)
+		log.Fatalf("Path does not exist: %s", tmpDir)
 	}
 	TmpWorkDir, err := ioutil.TempDir(tmpDir, "gitea-dump-")
 	if err != nil {
-		log.Fatal(4, "Failed to create tmp work directory: %v", err)
+		log.Fatalf("Failed to create tmp work directory: %v", err)
 	}
-	log.Info("Creating tmp work dir: %s", TmpWorkDir)
+	log.Printf("Creating tmp work dir: %s", TmpWorkDir)
 
 	reposDump := path.Join(TmpWorkDir, "gitea-repo.zip")
 	dbDump := path.Join(TmpWorkDir, "gitea-db.sql")
 
-	log.Info("Dumping local repositories...%s", setting.RepoRootPath)
+	log.Printf("Dumping local repositories...%s", setting.RepoRootPath)
 	zip.Verbose = ctx.Bool("verbose")
-	if err = zip.PackTo(setting.RepoRootPath, reposDump, true); err != nil {
-		log.Fatal(4, "Failed to dump local repositories: %v", err)
+	if err := zip.PackTo(setting.RepoRootPath, reposDump, true); err != nil {
+		log.Fatalf("Failed to dump local repositories: %v", err)
 	}
 
 	targetDBType := ctx.String("database")
 	if len(targetDBType) > 0 && targetDBType != models.DbCfg.Type {
-		log.Info("Dumping database %s => %s...", models.DbCfg.Type, targetDBType)
+		log.Printf("Dumping database %s => %s...", models.DbCfg.Type, targetDBType)
 	} else {
-		log.Info("Dumping database...")
+		log.Printf("Dumping database...")
 	}
 
-	if err = models.DumpDatabaseOld(dbDump, targetDBType); err != nil {
-		log.Fatal(4, "Failed to dump database: %v", err)
+	if err := models.DumpDatabase(dbDump, targetDBType); err != nil {
+		log.Fatalf("Failed to dump database: %v", err)
 	}
 
 	fileName := fmt.Sprintf("gitea-dump-%d.zip", time.Now().Unix())
-	log.Info("Packing dump files...")
+	log.Printf("Packing dump files...")
 	z, err := zip.Create(fileName)
 	if err != nil {
-		log.Fatal(4, "Failed to create %s: %v", fileName, err)
+		log.Fatalf("Failed to create %s: %v", fileName, err)
 	}
 
-	if err = z.AddFile("gitea-repo.zip", reposDump); err != nil {
-		log.Fatal(4, "Failed to include gitea-repo.zip: %v", err)
+	if err := z.AddFile("gitea-repo.zip", reposDump); err != nil {
+		log.Fatalf("Failed to include gitea-repo.zip: %v", err)
 	}
-	if err = z.AddFile("gitea-db.sql", dbDump); err != nil {
-		log.Fatal(4, "Failed to include gitea-db.sql: %v", err)
+	if err := z.AddFile("gitea-db.sql", dbDump); err != nil {
+		log.Fatalf("Failed to include gitea-db.sql: %v", err)
 	}
 	customDir, err := os.Stat(setting.CustomPath)
 	if err == nil && customDir.IsDir() {
-		if err = z.AddDir("custom", setting.CustomPath); err != nil {
-			log.Fatal(4, "Failed to include custom: %v", err)
+		if err := z.AddDir("custom", setting.CustomPath); err != nil {
+			log.Fatalf("Failed to include custom: %v", err)
 		}
 	} else {
-		log.Info("Custom dir %s doesn't exist, skipped", setting.CustomPath)
+		log.Printf("Custom dir %s doesn't exist, skipped", setting.CustomPath)
 	}
 
 	if com.IsExist(setting.AppDataPath) {
-		log.Info("Packing data directory...%s", setting.AppDataPath)
+		log.Printf("Packing data directory...%s", setting.AppDataPath)
 
 		var sessionAbsPath string
 		if setting.SessionConfig.Provider == "file" {
@@ -127,30 +125,30 @@ func runDump(ctx *cli.Context) error {
 			}
 			sessionAbsPath, _ = filepath.Abs(setting.SessionConfig.ProviderConfig)
 		}
-		if err = zipAddDirectoryExclude(z, "data", setting.AppDataPath, sessionAbsPath); err != nil {
-			log.Fatal(4, "Failed to include data directory: %v", err)
+		if err := zipAddDirectoryExclude(z, "data", setting.AppDataPath, sessionAbsPath); err != nil {
+			log.Fatalf("Failed to include data directory: %v", err)
 		}
 	}
 
-	if err = z.AddDir("log", setting.LogRootPath); err != nil {
-		log.Fatal(4, "Failed to include log: %v", err)
+	if err := z.AddDir("log", setting.LogRootPath); err != nil {
+		log.Fatalf("Failed to include log: %v", err)
 	}
 
 	if err = z.Close(); err != nil {
 		_ = os.Remove(fileName)
-		log.Fatal(4, "Failed to save %s: %v", fileName, err)
+		log.Fatalf("Failed to save %s: %v", fileName, err)
 	}
 
 	if err := os.Chmod(fileName, 0600); err != nil {
-		log.Info("Can't change file access permissions mask to 0600: %v", err)
+		log.Printf("Can't change file access permissions mask to 0600: %v", err)
 	}
 
-	log.Info("Removing tmp work dir: %s", TmpWorkDir)
+	log.Printf("Removing tmp work dir: %s", TmpWorkDir)
 
 	if err := os.RemoveAll(TmpWorkDir); err != nil {
-		log.Fatal(4, "Failed to remove %s: %v", TmpWorkDir, err)
+		log.Fatalf("Failed to remove %s: %v", TmpWorkDir, err)
 	}
-	log.Info("Finish dumping in file %s", fileName)
+	log.Printf("Finish dumping in file %s", fileName)
 
 	return nil
 }

cmd/restore.go

@@ -1,166 +0,0 @@
-// Copyright 2017 The Gogs Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package cmd
-
-import (
-	"os"
-	"path"
-
-	"github.com/Unknwon/cae/zip"
-	"github.com/Unknwon/com"
-	"github.com/mcuadros/go-version"
-	"github.com/urfave/cli"
-	"gopkg.in/ini.v1"
-
-	"code.gitea.io/gitea/models"
-	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/modules/setting"
-)
-
-// Restore a backup
-var Restore = cli.Command{
-	Name:  "restore",
-	Usage: "Restore files and database from backup",
-	Description: `Restore imports all related files and database from a backup archive.
-The backup version must lower or equal to current Gitea version. You can also import
-backup from other database engines, which is useful for database migrating.
-
-If corresponding files or database tables are not presented in the archive, they will
-be skipped and remian unchanged.`,
-	Action: runRestore,
-	Flags: []cli.Flag{
-		cli.StringFlag{
-			Name:  "config, c",
-			Value: "custom/conf/app.ini",
-			Usage: "Custom configuration file path",
-		},
-		cli.StringFlag{
-			Name:  "tempdir, t",
-			Value: os.TempDir(),
-			Usage: "Temporary directory path",
-		},
-		cli.StringFlag{
-			Name:  "from",
-			Value: "",
-			Usage: "Path to backup archive",
-		},
-		cli.BoolFlag{
-			Name:  "verbose, v",
-			Usage: "Show process details",
-		},
-		cli.BoolTFlag{
-			Name:  "repos",
-			Usage: "Restore repositories (default: true)",
-		},
-		cli.BoolTFlag{
-			Name:  "data",
-			Usage: "Restore attachments and avatars (default: true)",
-		},
-		cli.BoolTFlag{
-			Name:  "custom",
-			Usage: "Restore custom files (default: true)",
-		},
-		cli.BoolTFlag{
-			Name:  "db",
-			Usage: "Restore database (default: true)",
-		},
-	},
-}
-
-func runRestore(c *cli.Context) error {
-	zip.Verbose = c.Bool("verbose")
-
-	tmpDir := c.String("tempdir")
-	if !com.IsExist(tmpDir) {
-		log.Fatal(0, "'--tempdir' does not exist: %s", tmpDir)
-	}
-
-	log.Info("Restore backup from: %s", c.String("from"))
-	if err := zip.ExtractTo(c.String("from"), tmpDir); err != nil {
-		log.Fatal(0, "Fail to extract backup archive: %v", err)
-	}
-	archivePath := path.Join(tmpDir, archiveRootDir)
-
-	// Check backup version
-	metaFile := path.Join(archivePath, "metadata.ini")
-	if !com.IsExist(metaFile) {
-		log.Fatal(0, "File 'metadata.ini' is missing")
-	}
-	metadata, err := ini.Load(metaFile)
-	if err != nil {
-		log.Fatal(0, "Fail to load metadata '%s': %v", metaFile, err)
-	}
-	ver := metadata.Section("").Key("VERSION").MustInt(10000000)
-	if ver != backupVersion {
-		log.Fatal(0, "Current Backup version does not match the version in the backup: %d != %d", ver, backupVersion)
-	}
-	backupVersion := metadata.Section("").Key("GITEA_VERSION").MustString("999.0")
-	if version.Compare(setting.AppVer, backupVersion, "<") {
-		log.Fatal(0, "Current Gitea version is lower than backup version: %s < %s", setting.AppVer, backupVersion)
-	}
-
-	// If config file is not present in backup, user must set this file via flag.
-	// Otherwise, it's optional to set config file flag.
-	configFile := path.Join(archivePath, "custom/conf/app.ini")
-	if c.IsSet("config") {
-		setting.CustomConf = c.String("config")
-	} else if !com.IsExist(configFile) {
-		log.Fatal(0, "'--config' is not specified and custom config file is not found in backup")
-	} else {
-		setting.CustomConf = configFile
-	}
-	setting.NewContext()
-	models.LoadConfigs()
-	models.SetEngine()
-
-	// Database
-	if c.Bool("db") {
-		dbDir := path.Join(archivePath, "db")
-		if err = models.ImportDatabase(dbDir); err != nil {
-			log.Fatal(0, "Fail to import database: %v", err)
-		}
-	}
-
-	// Custom files
-	if c.Bool("custom") {
-		if com.IsExist(setting.CustomPath) {
-			if err = os.Rename(setting.CustomPath, setting.CustomPath+".bak"); err != nil {
-				log.Fatal(0, "Fail to backup current 'custom': %v", err)
-			}
-		}
-		if err = os.Rename(path.Join(archivePath, "custom"), setting.CustomPath); err != nil {
-			log.Fatal(0, "Fail to import 'custom': %v", err)
-		}
-	}
-
-	// Data files
-	if c.Bool("data") {
-		for _, dir := range []string{"attachments", "avatars"} {
-			dirPath := path.Join(setting.AppDataPath, dir)
-			if com.IsExist(dirPath) {
-				if err = os.Rename(dirPath, dirPath+".bak"); err != nil {
-					log.Fatal(0, "Fail to backup current 'data': %v", err)
-				}
-			}
-			if err = os.Rename(path.Join(archivePath, "data", dir), dirPath); err != nil {
-				log.Fatal(0, "Fail to import 'data': %v", err)
-			}
-		}
-	}
-
-	// Repositories
-	if c.Bool("repos") {
-		reposPath := path.Join(archivePath, "repositories.zip")
-		if !c.Bool("exclude-repos") && !c.Bool("database-only") && com.IsExist(reposPath) {
-			if err := zip.ExtractTo(reposPath, path.Dir(setting.RepoRootPath)); err != nil {
-				log.Fatal(0, "Fail to extract 'repositories.zip': %v", err)
-			}
-		}
-	}
-
-	os.RemoveAll(path.Join(tmpDir, archiveRootDir))
-	log.Info("Restore succeed!")
-	return nil
-}

cmd/serv.go

@@ -16,9 +16,7 @@ import (
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/modules/private"
 	"code.gitea.io/gitea/modules/setting"
-
 	"github.com/Unknwon/com"
 	"github.com/dgrijalva/jwt-go"
 	"github.com/urfave/cli"
@@ -107,8 +105,7 @@ func runServ(c *cli.Context) error {
 	}
 
 	if len(c.Args()) < 1 {
-		cli.ShowSubcommandHelp(c)
-		return nil
+		fail("Not enough arguments", "Not enough arguments")
 	}
 
 	cmd := os.Getenv("SSH_ORIGINAL_COMMAND")
@@ -126,8 +123,8 @@ func runServ(c *cli.Context) error {
 			fail("Unknown git command", "LFS authentication request over SSH denied, LFS support is disabled")
 		}
 
-		argsSplit := strings.Split(args, " ")
-		if len(argsSplit) >= 2 {
+		if strings.Contains(args, " ") {
+			argsSplit := strings.SplitN(args, " ", 2)
 			args = strings.TrimSpace(argsSplit[0])
 			lfsVerb = strings.TrimSpace(argsSplit[1])
 		}
@@ -182,10 +179,8 @@ func runServ(c *cli.Context) error {
 	if verb == lfsAuthenticateVerb {
 		if lfsVerb == "upload" {
 			requestedMode = models.AccessModeWrite
-		} else if lfsVerb == "download" {
-			requestedMode = models.AccessModeRead
 		} else {
-			fail("Unknown LFS verb", "Unkown lfs verb %s", lfsVerb)
+			requestedMode = models.AccessModeRead
 		}
 	}
 
@@ -237,7 +232,7 @@ func runServ(c *cli.Context) error {
 				fail("internal error", "Failed to get user by key ID(%d): %v", keyID, err)
 			}
 
-			mode, err := models.AccessLevel(user.ID, repo)
+			mode, err := models.AccessLevel(user, repo)
 			if err != nil {
 				fail("Internal error", "Failed to check access: %v", err)
 			} else if mode < requestedMode {
@@ -301,12 +296,6 @@ func runServ(c *cli.Context) error {
 		gitcmd = exec.Command(verb, repoPath)
 	}
 
-	if isWiki {
-		if err = repo.InitWiki(); err != nil {
-			fail("Internal error", "Failed to init wiki repo: %v", err)
-		}
-	}
-
 	os.Setenv(models.ProtectedBranchRepoID, fmt.Sprintf("%d", repo.ID))
 
 	gitcmd.Dir = setting.RepoRootPath
@@ -319,7 +308,13 @@ func runServ(c *cli.Context) error {
 
 	// Update user key activity.
 	if keyID > 0 {
-		if err = private.UpdatePublicKeyUpdated(keyID); err != nil {
+		key, err := models.GetPublicKeyByID(keyID)
+		if err != nil {
+			fail("Internal error", "GetPublicKeyById: %v", err)
+		}
+
+		key.Updated = time.Now()
+		if err = models.UpdatePublicKey(key); err != nil {
 			fail("Internal error", "UpdatePublicKey: %v", err)
 		}
 	}

cmd/web.go

@@ -11,15 +11,37 @@ import (
 	"net/http/fcgi"
 	_ "net/http/pprof" // Used for debugging if enabled and a web server is running
 	"os"
+	"path"
 	"strings"
 
+	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/auth"
+	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/lfs"
 	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/options"
+	"code.gitea.io/gitea/modules/public"
 	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/modules/templates"
 	"code.gitea.io/gitea/routers"
-	"code.gitea.io/gitea/routers/routes"
+	"code.gitea.io/gitea/routers/admin"
+	apiv1 "code.gitea.io/gitea/routers/api/v1"
+	"code.gitea.io/gitea/routers/dev"
+	"code.gitea.io/gitea/routers/org"
+	"code.gitea.io/gitea/routers/repo"
+	"code.gitea.io/gitea/routers/user"
 
+	"github.com/go-macaron/binding"
+	"github.com/go-macaron/cache"
+	"github.com/go-macaron/captcha"
+	"github.com/go-macaron/csrf"
+	"github.com/go-macaron/gzip"
+	"github.com/go-macaron/i18n"
+	"github.com/go-macaron/session"
+	"github.com/go-macaron/toolbox"
 	context2 "github.com/gorilla/context"
 	"github.com/urfave/cli"
+	macaron "gopkg.in/macaron.v1"
 )
 
 // CmdWeb represents the available web sub-command.
@@ -48,6 +70,94 @@ and it takes care of all the other things for you`,
 	},
 }
 
+// newMacaron initializes Macaron instance.
+func newMacaron() *macaron.Macaron {
+	m := macaron.New()
+	if !setting.DisableRouterLog {
+		m.Use(macaron.Logger())
+	}
+	m.Use(macaron.Recovery())
+	if setting.EnableGzip {
+		m.Use(gzip.Gziper())
+	}
+	if setting.Protocol == setting.FCGI {
+		m.SetURLPrefix(setting.AppSubURL)
+	}
+	m.Use(public.Custom(
+		&public.Options{
+			SkipLogging: setting.DisableRouterLog,
+		},
+	))
+	m.Use(public.Static(
+		&public.Options{
+			Directory:   path.Join(setting.StaticRootPath, "public"),
+			SkipLogging: setting.DisableRouterLog,
+		},
+	))
+	m.Use(macaron.Static(
+		setting.AvatarUploadPath,
+		macaron.StaticOptions{
+			Prefix:      "avatars",
+			SkipLogging: setting.DisableRouterLog,
+			ETag:        true,
+		},
+	))
+
+	m.Use(templates.Renderer())
+	models.InitMailRender(templates.Mailer())
+
+	localeNames, err := options.Dir("locale")
+
+	if err != nil {
+		log.Fatal(4, "Failed to list locale files: %v", err)
+	}
+
+	localFiles := make(map[string][]byte)
+
+	for _, name := range localeNames {
+		localFiles[name], err = options.Locale(name)
+
+		if err != nil {
+			log.Fatal(4, "Failed to load %s locale file. %v", name, err)
+		}
+	}
+
+	m.Use(i18n.I18n(i18n.Options{
+		SubURL:      setting.AppSubURL,
+		Files:       localFiles,
+		Langs:       setting.Langs,
+		Names:       setting.Names,
+		DefaultLang: "en-US",
+		Redirect:    true,
+	}))
+	m.Use(cache.Cacher(cache.Options{
+		Adapter:       setting.CacheAdapter,
+		AdapterConfig: setting.CacheConn,
+		Interval:      setting.CacheInterval,
+	}))
+	m.Use(captcha.Captchaer(captcha.Options{
+		SubURL: setting.AppSubURL,
+	}))
+	m.Use(session.Sessioner(setting.SessionConfig))
+	m.Use(csrf.Csrfer(csrf.Options{
+		Secret:     setting.SecretKey,
+		Cookie:     setting.CSRFCookieName,
+		SetCookie:  true,
+		Header:     "X-Csrf-Token",
+		CookiePath: setting.AppSubURL,
+	}))
+	m.Use(toolbox.Toolboxer(m, toolbox.Options{
+		HealthCheckFuncs: []*toolbox.HealthCheckFuncDesc{
+			{
+				Desc: "Database connection",
+				Func: models.Ping,
+			},
+		},
+	}))
+	m.Use(context.Contexter())
+	return m
+}
+
 func runWeb(ctx *cli.Context) error {
 	if ctx.IsSet("config") {
 		setting.CustomConf = ctx.String("config")
@@ -59,8 +169,482 @@ func runWeb(ctx *cli.Context) error {
 
 	routers.GlobalInit()
 
-	m := routes.NewMacaron()
-	routes.RegisterRoutes(m)
+	m := newMacaron()
+
+	reqSignIn := context.Toggle(&context.ToggleOptions{SignInRequired: true})
+	ignSignIn := context.Toggle(&context.ToggleOptions{SignInRequired: setting.Service.RequireSignInView})
+	ignSignInAndCsrf := context.Toggle(&context.ToggleOptions{DisableCSRF: true})
+	reqSignOut := context.Toggle(&context.ToggleOptions{SignOutRequired: true})
+
+	bindIgnErr := binding.BindIgnErr
+
+	m.Use(user.GetNotificationCount)
+
+	// FIXME: not all routes need go through same middlewares.
+	// Especially some AJAX requests, we can reduce middleware number to improve performance.
+	// Routers.
+	m.Get("/", ignSignIn, routers.Home)
+	m.Group("/explore", func() {
+		m.Get("", func(ctx *context.Context) {
+			ctx.Redirect(setting.AppSubURL + "/explore/repos")
+		})
+		m.Get("/repos", routers.ExploreRepos)
+		m.Get("/users", routers.ExploreUsers)
+		m.Get("/organizations", routers.ExploreOrganizations)
+	}, ignSignIn)
+	m.Combo("/install", routers.InstallInit).Get(routers.Install).
+		Post(bindIgnErr(auth.InstallForm{}), routers.InstallPost)
+	m.Get("/^:type(issues|pulls)$", reqSignIn, user.Issues)
+
+	// ***** START: User *****
+	m.Group("/user", func() {
+		m.Get("/login", user.SignIn)
+		m.Post("/login", bindIgnErr(auth.SignInForm{}), user.SignInPost)
+		m.Get("/sign_up", user.SignUp)
+		m.Post("/sign_up", bindIgnErr(auth.RegisterForm{}), user.SignUpPost)
+		m.Get("/reset_password", user.ResetPasswd)
+		m.Post("/reset_password", user.ResetPasswdPost)
+		m.Group("/oauth2", func() {
+			m.Get("/:provider", user.SignInOAuth)
+			m.Get("/:provider/callback", user.SignInOAuthCallback)
+		})
+		m.Get("/link_account", user.LinkAccount)
+		m.Post("/link_account_signin", bindIgnErr(auth.SignInForm{}), user.LinkAccountPostSignIn)
+		m.Post("/link_account_signup", bindIgnErr(auth.RegisterForm{}), user.LinkAccountPostRegister)
+		m.Group("/two_factor", func() {
+			m.Get("", user.TwoFactor)
+			m.Post("", bindIgnErr(auth.TwoFactorAuthForm{}), user.TwoFactorPost)
+			m.Get("/scratch", user.TwoFactorScratch)
+			m.Post("/scratch", bindIgnErr(auth.TwoFactorScratchAuthForm{}), user.TwoFactorScratchPost)
+		})
+	}, reqSignOut)
+
+	m.Group("/user/settings", func() {
+		m.Get("", user.Settings)
+		m.Post("", bindIgnErr(auth.UpdateProfileForm{}), user.SettingsPost)
+		m.Combo("/avatar").Get(user.SettingsAvatar).
+			Post(binding.MultipartForm(auth.AvatarForm{}), user.SettingsAvatarPost)
+		m.Post("/avatar/delete", user.SettingsDeleteAvatar)
+		m.Combo("/email").Get(user.SettingsEmails).
+			Post(bindIgnErr(auth.AddEmailForm{}), user.SettingsEmailPost)
+		m.Post("/email/delete", user.DeleteEmail)
+		m.Get("/password", user.SettingsPassword)
+		m.Post("/password", bindIgnErr(auth.ChangePasswordForm{}), user.SettingsPasswordPost)
+		m.Combo("/ssh").Get(user.SettingsSSHKeys).
+			Post(bindIgnErr(auth.AddSSHKeyForm{}), user.SettingsSSHKeysPost)
+		m.Post("/ssh/delete", user.DeleteSSHKey)
+		m.Combo("/applications").Get(user.SettingsApplications).
+			Post(bindIgnErr(auth.NewAccessTokenForm{}), user.SettingsApplicationsPost)
+		m.Post("/applications/delete", user.SettingsDeleteApplication)
+		m.Route("/delete", "GET,POST", user.SettingsDelete)
+		m.Combo("/account_link").Get(user.SettingsAccountLinks).Post(user.SettingsDeleteAccountLink)
+		m.Group("/two_factor", func() {
+			m.Get("", user.SettingsTwoFactor)
+			m.Post("/regenerate_scratch", user.SettingsTwoFactorRegenerateScratch)
+			m.Post("/disable", user.SettingsTwoFactorDisable)
+			m.Get("/enroll", user.SettingsTwoFactorEnroll)
+			m.Post("/enroll", bindIgnErr(auth.TwoFactorAuthForm{}), user.SettingsTwoFactorEnrollPost)
+		})
+	}, reqSignIn, func(ctx *context.Context) {
+		ctx.Data["PageIsUserSettings"] = true
+	})
+
+	m.Group("/user", func() {
+		// r.Get("/feeds", binding.Bind(auth.FeedsForm{}), user.Feeds)
+		m.Any("/activate", user.Activate)
+		m.Any("/activate_email", user.ActivateEmail)
+		m.Get("/email2user", user.Email2User)
+		m.Get("/forget_password", user.ForgotPasswd)
+		m.Post("/forget_password", user.ForgotPasswdPost)
+		m.Get("/logout", user.SignOut)
+	})
+	// ***** END: User *****
+
+	adminReq := context.Toggle(&context.ToggleOptions{SignInRequired: true, AdminRequired: true})
+
+	// ***** START: Admin *****
+	m.Group("/admin", func() {
+		m.Get("", adminReq, admin.Dashboard)
+		m.Get("/config", admin.Config)
+		m.Post("/config/test_mail", admin.SendTestMail)
+		m.Get("/monitor", admin.Monitor)
+
+		m.Group("/users", func() {
+			m.Get("", admin.Users)
+			m.Combo("/new").Get(admin.NewUser).Post(bindIgnErr(auth.AdminCreateUserForm{}), admin.NewUserPost)
+			m.Combo("/:userid").Get(admin.EditUser).Post(bindIgnErr(auth.AdminEditUserForm{}), admin.EditUserPost)
+			m.Post("/:userid/delete", admin.DeleteUser)
+		})
+
+		m.Group("/orgs", func() {
+			m.Get("", admin.Organizations)
+		})
+
+		m.Group("/repos", func() {
+			m.Get("", admin.Repos)
+			m.Post("/delete", admin.DeleteRepo)
+		})
+
+		m.Group("/auths", func() {
+			m.Get("", admin.Authentications)
+			m.Combo("/new").Get(admin.NewAuthSource).Post(bindIgnErr(auth.AuthenticationForm{}), admin.NewAuthSourcePost)
+			m.Combo("/:authid").Get(admin.EditAuthSource).
+				Post(bindIgnErr(auth.AuthenticationForm{}), admin.EditAuthSourcePost)
+			m.Post("/:authid/delete", admin.DeleteAuthSource)
+		})
+
+		m.Group("/notices", func() {
+			m.Get("", admin.Notices)
+			m.Post("/delete", admin.DeleteNotices)
+			m.Get("/empty", admin.EmptyNotices)
+		})
+	}, adminReq)
+	// ***** END: Admin *****
+
+	m.Group("", func() {
+		m.Group("/:username", func() {
+			m.Get("", user.Profile)
+			m.Get("/followers", user.Followers)
+			m.Get("/following", user.Following)
+		})
+
+		m.Get("/attachments/:uuid", func(ctx *context.Context) {
+			attach, err := models.GetAttachmentByUUID(ctx.Params(":uuid"))
+			if err != nil {
+				if models.IsErrAttachmentNotExist(err) {
+					ctx.Error(404)
+				} else {
+					ctx.Handle(500, "GetAttachmentByUUID", err)
+				}
+				return
+			}
+
+			fr, err := os.Open(attach.LocalPath())
+			if err != nil {
+				ctx.Handle(500, "Open", err)
+				return
+			}
+			defer fr.Close()
+
+			if err = repo.ServeData(ctx, attach.Name, fr); err != nil {
+				ctx.Handle(500, "ServeData", err)
+				return
+			}
+		})
+		m.Post("/attachments", repo.UploadAttachment)
+	}, ignSignIn)
+
+	m.Group("/:username", func() {
+		m.Get("/action/:action", user.Action)
+	}, reqSignIn)
+
+	if macaron.Env == macaron.DEV {
+		m.Get("/template/*", dev.TemplatePreview)
+	}
+
+	reqRepoAdmin := context.RequireRepoAdmin()
+	reqRepoWriter := context.RequireRepoWriter()
+
+	// ***** START: Organization *****
+	m.Group("/org", func() {
+		m.Group("", func() {
+			m.Get("/create", org.Create)
+			m.Post("/create", bindIgnErr(auth.CreateOrgForm{}), org.CreatePost)
+		}, func(ctx *context.Context) {
+			if !ctx.User.CanCreateOrganization() {
+				ctx.NotFound()
+			}
+		})
+
+		m.Group("/:org", func() {
+			m.Get("/dashboard", user.Dashboard)
+			m.Get("/^:type(issues|pulls)$", user.Issues)
+			m.Get("/members", org.Members)
+			m.Get("/members/action/:action", org.MembersAction)
+
+			m.Get("/teams", org.Teams)
+		}, context.OrgAssignment(true))
+
+		m.Group("/:org", func() {
+			m.Get("/teams/:team", org.TeamMembers)
+			m.Get("/teams/:team/repositories", org.TeamRepositories)
+			m.Route("/teams/:team/action/:action", "GET,POST", org.TeamsAction)
+			m.Route("/teams/:team/action/repo/:action", "GET,POST", org.TeamsRepoAction)
+		}, context.OrgAssignment(true, false, true))
+
+		m.Group("/:org", func() {
+			m.Get("/teams/new", org.NewTeam)
+			m.Post("/teams/new", bindIgnErr(auth.CreateTeamForm{}), org.NewTeamPost)
+			m.Get("/teams/:team/edit", org.EditTeam)
+			m.Post("/teams/:team/edit", bindIgnErr(auth.CreateTeamForm{}), org.EditTeamPost)
+			m.Post("/teams/:team/delete", org.DeleteTeam)
+
+			m.Group("/settings", func() {
+				m.Combo("").Get(org.Settings).
+					Post(bindIgnErr(auth.UpdateOrgSettingForm{}), org.SettingsPost)
+				m.Post("/avatar", binding.MultipartForm(auth.AvatarForm{}), org.SettingsAvatar)
+				m.Post("/avatar/delete", org.SettingsDeleteAvatar)
+
+				m.Group("/hooks", func() {
+					m.Get("", org.Webhooks)
+					m.Post("/delete", org.DeleteWebhook)
+					m.Get("/:type/new", repo.WebhooksNew)
+					m.Post("/gogs/new", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksNewPost)
+					m.Post("/slack/new", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksNewPost)
+					m.Get("/:id", repo.WebHooksEdit)
+					m.Post("/gogs/:id", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksEditPost)
+					m.Post("/slack/:id", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksEditPost)
+				})
+
+				m.Route("/delete", "GET,POST", org.SettingsDelete)
+			})
+
+			m.Route("/invitations/new", "GET,POST", org.Invitation)
+		}, context.OrgAssignment(true, true))
+	}, reqSignIn)
+	// ***** END: Organization *****
+
+	// ***** START: Repository *****
+	m.Group("/repo", func() {
+		m.Get("/create", repo.Create)
+		m.Post("/create", bindIgnErr(auth.CreateRepoForm{}), repo.CreatePost)
+		m.Get("/migrate", repo.Migrate)
+		m.Post("/migrate", bindIgnErr(auth.MigrateRepoForm{}), repo.MigratePost)
+		m.Combo("/fork/:repoid").Get(repo.Fork).
+			Post(bindIgnErr(auth.CreateRepoForm{}), repo.ForkPost)
+	}, reqSignIn)
+
+	m.Group("/:username/:reponame", func() {
+		m.Group("/settings", func() {
+			m.Combo("").Get(repo.Settings).
+				Post(bindIgnErr(auth.RepoSettingForm{}), repo.SettingsPost)
+			m.Group("/collaboration", func() {
+				m.Combo("").Get(repo.Collaboration).Post(repo.CollaborationPost)
+				m.Post("/access_mode", repo.ChangeCollaborationAccessMode)
+				m.Post("/delete", repo.DeleteCollaboration)
+			})
+			m.Group("/branches", func() {
+				m.Combo("").Get(repo.ProtectedBranch).Post(repo.ProtectedBranchPost)
+				m.Post("/can_push", repo.ChangeProtectedBranch)
+				m.Post("/delete", repo.DeleteProtectedBranch)
+			})
+
+			m.Group("/hooks", func() {
+				m.Get("", repo.Webhooks)
+				m.Post("/delete", repo.DeleteWebhook)
+				m.Get("/:type/new", repo.WebhooksNew)
+				m.Post("/gogs/new", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksNewPost)
+				m.Post("/slack/new", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksNewPost)
+				m.Get("/:id", repo.WebHooksEdit)
+				m.Post("/:id/test", repo.TestWebhook)
+				m.Post("/gogs/:id", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksEditPost)
+				m.Post("/slack/:id", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksEditPost)
+
+				m.Group("/git", func() {
+					m.Get("", repo.GitHooks)
+					m.Combo("/:name").Get(repo.GitHooksEdit).
+						Post(repo.GitHooksEditPost)
+				}, context.GitHookService())
+			})
+
+			m.Group("/keys", func() {
+				m.Combo("").Get(repo.DeployKeys).
+					Post(bindIgnErr(auth.AddSSHKeyForm{}), repo.DeployKeysPost)
+				m.Post("/delete", repo.DeleteDeployKey)
+			})
+
+		}, func(ctx *context.Context) {
+			ctx.Data["PageIsSettings"] = true
+		}, context.UnitTypes())
+	}, reqSignIn, context.RepoAssignment(), reqRepoAdmin, context.RepoRef())
+
+	m.Get("/:username/:reponame/action/:action", reqSignIn, context.RepoAssignment(), repo.Action)
+	m.Group("/:username/:reponame", func() {
+		// FIXME: should use different URLs but mostly same logic for comments of issue and pull reuqest.
+		// So they can apply their own enable/disable logic on routers.
+		m.Group("/issues", func() {
+			m.Combo("/new", repo.MustEnableIssues).Get(context.RepoRef(), repo.NewIssue).
+				Post(bindIgnErr(auth.CreateIssueForm{}), repo.NewIssuePost)
+
+			m.Group("/:index", func() {
+				m.Post("/label", repo.UpdateIssueLabel)
+				m.Post("/milestone", repo.UpdateIssueMilestone)
+				m.Post("/assignee", repo.UpdateIssueAssignee)
+			}, reqRepoWriter)
+
+			m.Group("/:index", func() {
+				m.Post("/title", repo.UpdateIssueTitle)
+				m.Post("/content", repo.UpdateIssueContent)
+				m.Combo("/comments").Post(bindIgnErr(auth.CreateCommentForm{}), repo.NewComment)
+			})
+		})
+		m.Group("/comments/:id", func() {
+			m.Post("", repo.UpdateCommentContent)
+			m.Post("/delete", repo.DeleteComment)
+		})
+		m.Group("/labels", func() {
+			m.Post("/new", bindIgnErr(auth.CreateLabelForm{}), repo.NewLabel)
+			m.Post("/edit", bindIgnErr(auth.CreateLabelForm{}), repo.UpdateLabel)
+			m.Post("/delete", repo.DeleteLabel)
+			m.Post("/initialize", bindIgnErr(auth.InitializeLabelsForm{}), repo.InitializeLabels)
+		}, reqRepoWriter, context.RepoRef())
+		m.Group("/milestones", func() {
+			m.Combo("/new").Get(repo.NewMilestone).
+				Post(bindIgnErr(auth.CreateMilestoneForm{}), repo.NewMilestonePost)
+			m.Get("/:id/edit", repo.EditMilestone)
+			m.Post("/:id/edit", bindIgnErr(auth.CreateMilestoneForm{}), repo.EditMilestonePost)
+			m.Get("/:id/:action", repo.ChangeMilestonStatus)
+			m.Post("/delete", repo.DeleteMilestone)
+		}, reqRepoWriter, context.RepoRef())
+		m.Group("/releases", func() {
+			m.Get("/new", repo.NewRelease)
+			m.Post("/new", bindIgnErr(auth.NewReleaseForm{}), repo.NewReleasePost)
+			m.Post("/delete", repo.DeleteRelease)
+		}, reqRepoWriter, context.RepoRef())
+		m.Group("/releases", func() {
+			m.Get("/edit/*", repo.EditRelease)
+			m.Post("/edit/*", bindIgnErr(auth.EditReleaseForm{}), repo.EditReleasePost)
+		}, reqRepoWriter, func(ctx *context.Context) {
+			var err error
+			ctx.Repo.Commit, err = ctx.Repo.GitRepo.GetBranchCommit(ctx.Repo.Repository.DefaultBranch)
+			if err != nil {
+				ctx.Handle(500, "GetBranchCommit", err)
+				return
+			}
+			ctx.Repo.CommitsCount, err = ctx.Repo.Commit.CommitsCount()
+			if err != nil {
+				ctx.Handle(500, "CommitsCount", err)
+				return
+			}
+			ctx.Data["CommitsCount"] = ctx.Repo.CommitsCount
+		})
+
+		m.Combo("/compare/*", repo.MustAllowPulls, repo.SetEditorconfigIfExists).
+			Get(repo.CompareAndPullRequest).
+			Post(bindIgnErr(auth.CreateIssueForm{}), repo.CompareAndPullRequestPost)
+
+		m.Group("", func() {
+			m.Combo("/_edit/*").Get(repo.EditFile).
+				Post(bindIgnErr(auth.EditRepoFileForm{}), repo.EditFilePost)
+			m.Combo("/_new/*").Get(repo.NewFile).
+				Post(bindIgnErr(auth.EditRepoFileForm{}), repo.NewFilePost)
+			m.Post("/_preview/*", bindIgnErr(auth.EditPreviewDiffForm{}), repo.DiffPreviewPost)
+			m.Combo("/_delete/*").Get(repo.DeleteFile).
+				Post(bindIgnErr(auth.DeleteRepoFileForm{}), repo.DeleteFilePost)
+
+			m.Group("", func() {
+				m.Combo("/_upload/*").Get(repo.UploadFile).
+					Post(bindIgnErr(auth.UploadRepoFileForm{}), repo.UploadFilePost)
+				m.Post("/upload-file", repo.UploadFileToServer)
+				m.Post("/upload-remove", bindIgnErr(auth.RemoveUploadFileForm{}), repo.RemoveUploadFileFromServer)
+			}, func(ctx *context.Context) {
+				if !setting.Repository.Upload.Enabled {
+					ctx.Handle(404, "", nil)
+					return
+				}
+			})
+		}, reqRepoWriter, context.RepoRef(), func(ctx *context.Context) {
+			if !ctx.Repo.Repository.CanEnableEditor() || ctx.Repo.IsViewCommit {
+				ctx.Handle(404, "", nil)
+				return
+			}
+		})
+	}, reqSignIn, context.RepoAssignment(), repo.MustBeNotBare, context.UnitTypes())
+
+	m.Group("/:username/:reponame", func() {
+		m.Group("", func() {
+			m.Get("/releases", repo.Releases)
+			m.Get("/^:type(issues|pulls)$", repo.RetrieveLabels, repo.Issues)
+			m.Get("/^:type(issues|pulls)$/:index", repo.ViewIssue)
+			m.Get("/labels/", repo.RetrieveLabels, repo.Labels)
+			m.Get("/milestones", repo.Milestones)
+		}, context.RepoRef())
+
+		// m.Get("/branches", repo.Branches)
+		m.Post("/branches/:name/delete", reqSignIn, reqRepoWriter, repo.DeleteBranchPost)
+
+		m.Group("/wiki", func() {
+			m.Get("/?:page", repo.Wiki)
+			m.Get("/_pages", repo.WikiPages)
+
+			m.Group("", func() {
+				m.Combo("/_new").Get(repo.NewWiki).
+					Post(bindIgnErr(auth.NewWikiForm{}), repo.NewWikiPost)
+				m.Combo("/:page/_edit").Get(repo.EditWiki).
+					Post(bindIgnErr(auth.NewWikiForm{}), repo.EditWikiPost)
+				m.Post("/:page/delete", repo.DeleteWikiPagePost)
+			}, reqSignIn, reqRepoWriter)
+		}, repo.MustEnableWiki, context.RepoRef())
+
+		m.Group("/wiki", func() {
+			m.Get("/raw/*", repo.WikiRaw)
+			m.Get("/*", repo.WikiRaw)
+		}, repo.MustEnableWiki)
+
+		m.Get("/archive/*", repo.Download)
+
+		m.Group("/pulls/:index", func() {
+			m.Get("/commits", context.RepoRef(), repo.ViewPullCommits)
+			m.Get("/files", context.RepoRef(), repo.SetEditorconfigIfExists, repo.SetDiffViewStyle, repo.ViewPullFiles)
+			m.Post("/merge", reqRepoWriter, repo.MergePullRequest)
+		}, repo.MustAllowPulls)
+
+		m.Group("", func() {
+			m.Get("/src/*", repo.SetEditorconfigIfExists, repo.Home)
+			m.Get("/raw/*", repo.SingleDownload)
+			m.Get("/commits/*", repo.RefCommits)
+			m.Get("/graph", repo.Graph)
+			m.Get("/commit/:sha([a-f0-9]{7,40})$", repo.SetEditorconfigIfExists, repo.SetDiffViewStyle, repo.Diff)
+			m.Get("/forks", repo.Forks)
+		}, context.RepoRef())
+		m.Get("/commit/:sha([a-f0-9]{7,40})\\.:ext(patch|diff)", repo.RawDiff)
+
+		m.Get("/compare/:before([a-z0-9]{40})\\.\\.\\.:after([a-z0-9]{40})", repo.SetEditorconfigIfExists, repo.SetDiffViewStyle, repo.CompareDiff)
+	}, ignSignIn, context.RepoAssignment(), repo.MustBeNotBare, context.UnitTypes())
+	m.Group("/:username/:reponame", func() {
+		m.Get("/stars", repo.Stars)
+		m.Get("/watchers", repo.Watchers)
+	}, ignSignIn, context.RepoAssignment(), context.RepoRef(), context.UnitTypes())
+
+	m.Group("/:username", func() {
+		m.Group("/:reponame", func() {
+			m.Get("", repo.SetEditorconfigIfExists, repo.Home)
+			m.Get("\\.git$", repo.SetEditorconfigIfExists, repo.Home)
+		}, ignSignIn, context.RepoAssignment(true), context.RepoRef(), context.UnitTypes())
+
+		m.Group("/:reponame", func() {
+			m.Group("/info/lfs", func() {
+				m.Post("/objects/batch", lfs.BatchHandler)
+				m.Get("/objects/:oid/:filename", lfs.ObjectOidHandler)
+				m.Any("/objects/:oid", lfs.ObjectOidHandler)
+				m.Post("/objects", lfs.PostHandler)
+			}, ignSignInAndCsrf)
+			m.Any("/*", ignSignInAndCsrf, repo.HTTP)
+			m.Head("/tasks/trigger", repo.TriggerTask)
+		})
+	})
+	// ***** END: Repository *****
+
+	m.Group("/notifications", func() {
+		m.Get("", user.Notifications)
+		m.Post("/status", user.NotificationStatusPost)
+	}, reqSignIn)
+
+	m.Group("/api", func() {
+		apiv1.RegisterRoutes(m)
+	}, ignSignIn)
+
+	// robots.txt
+	m.Get("/robots.txt", func(ctx *context.Context) {
+		if setting.HasRobotsTxt {
+			ctx.ServeFileContent(path.Join(setting.CustomPath, "robots.txt"))
+		} else {
+			ctx.Error(404)
+		}
+	})
+
+	// Not found handler.
+	m.NotFound(routers.NotFound)
 
 	// Flag for port number in case first time run conflict.
 	if ctx.IsSet("port") {
@@ -93,12 +677,7 @@ func runWeb(ctx *cli.Context) error {
 	case setting.HTTPS:
 		err = runHTTPS(listenAddr, setting.CertFile, setting.KeyFile, context2.ClearHandler(m))
 	case setting.FCGI:
-		listener, err := net.Listen("tcp", listenAddr)
-		if err != nil {
-			log.Fatal(4, "Failed to bind %s", listenAddr, err)
-		}
-		defer listener.Close()
-		err = fcgi.Serve(listener, context2.ClearHandler(m))
+		err = fcgi.Serve(nil, context2.ClearHandler(m))
 	case setting.UnixSocket:
 		if err := os.Remove(listenAddr); err != nil && !os.IsNotExist(err) {
 			log.Fatal(4, "Failed to remove unix socket directory %s: %v", listenAddr, err)

cmd/web_graceful.go

@@ -11,7 +11,6 @@ import (
 	"net/http"
 
 	"code.gitea.io/gitea/modules/log"
-
 	"github.com/facebookgo/grace/gracehttp"
 )
 

conf/app.ini

@@ -74,11 +74,6 @@ ORG_PAGING_NUM = 50
 ; Number of repos that are showed in one page
 REPO_PAGING_NUM = 15
 
-[ui.meta]
-AUTHOR = Gitea - Git with a cup of tea
-DESCRIPTION = Gitea (Git with a cup of tea) is a painless self-hosted Git service written in Go
-KEYWORDS = go,git,self-hosted,gitea
-
 [markdown]
 ; Enable hard line break extension
 ENABLE_HARD_LINE_BREAK = false
@@ -152,7 +147,7 @@ RSA     = 2048
 DSA     = 1024
 
 [database]
-; Either "mysql", "postgres", "mssql" or "sqlite3", it's your choice
+; Either "mysql", "postgres" or "sqlite3", it's your choice
 DB_TYPE = mysql
 HOST = 127.0.0.1:3306
 NAME = gitea
@@ -187,40 +182,6 @@ MIN_PASSWORD_LENGTH = 6
 ; True when users are allowed to import local server paths
 IMPORT_LOCAL_PATHS = false
 
-[openid]
-;
-; OpenID is an open standard and decentralized authentication protocol.
-; Your identity is the address of a webpage you provide, which describes
-; how to prove you are in control of that page.
-;
-; For more info: https://en.wikipedia.org/wiki/OpenID
-;
-; Current implementation supports OpenID-2.0
-;
-; Tested to work providers at the time of writing:
-;  - Any GNUSocial node (your.hostname.tld/username)
-;  - Any SimpleID provider (http://simpleid.koinic.net)
-;  - http://openid.org.cn/
-;  - openid.stackexchange.com
-;  - login.launchpad.net
-;  - <username>.livejournal.com
-;
-; Whether to allow signin in via OpenID
-ENABLE_OPENID_SIGNIN = true
-; Whether to allow registering via OpenID
-; Do not include to rely on DISABLE_REGISTRATION setting
-;ENABLE_OPENID_SIGNUP = true
-; Allowed URI patterns (POSIX regexp).
-; Space separated.
-; Only these would be allowed if non-blank.
-; Example value: trusted.domain.org trusted.domain.net
-WHITELISTED_URIS =
-; Forbidden URI patterns (POSIX regexp).
-; Space sepaated.
-; Only used if WHITELISTED_URIS is blank.
-; Example value: loadaverage.org/badguy stackexchange.com/.*spammer
-BLACKLISTED_URIS =
-
 [service]
 ACTIVE_CODE_LIVE_MINUTES = 180
 RESET_PASSWD_CODE_LIVE_MINUTES = 180
@@ -313,9 +274,9 @@ COOKIE_NAME = i_like_gitea
 COOKIE_SECURE = false
 ; Enable set cookie, default is true
 ENABLE_SET_COOKIE = true
-; Session GC time interval in seconds, default is 86400 (1 day)
+; Session GC time interval, default is 86400
 GC_INTERVAL_TIME = 86400
-; Session life time in seconds, default is 86400 (1 day)
+; Session life time, default is 86400
 SESSION_LIFE_TIME = 86400
 
 [picture]
@@ -461,10 +422,8 @@ PULL = 300
 GC = 60
 
 [mirror]
-; Default interval as a duration between each check
-DEFAULT_INTERVAL = 8h
-; Min interval as a duration must be > 1m
-MIN_INTERVAL = 10m
+; Default interval in hours between each check
+DEFAULT_INTERVAL = 8
 
 [api]
 ; Max number of items will response in a page

integrations/gitea-integration-meta/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2017 Ethan Koenig
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

integrations/gitea-integration-meta/README.md

@@ -1,2 +0,0 @@
-# gitea-integration
-Gitea integration test environment

integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/HEAD

@@ -1 +0,0 @@
-ref: refs/heads/master

integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/config

@@ -1,4 +0,0 @@
-[core]
-	repositoryformatversion = 0
-	filemode = true
-	bare = true

integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/description

@@ -1 +0,0 @@
-Unnamed repository; edit this file 'description' to name the repository.

integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/applypatch-msg.sample

@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to check the commit log message taken by
-# applypatch from an e-mail message.
-#
-# The hook should exit with non-zero status after issuing an
-# appropriate message if it wants to stop the commit.  The hook is
-# allowed to edit the commit message file.
-#
-# To enable this hook, rename this file to "applypatch-msg".
-
-. git-sh-setup
-commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
-test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
-:

integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/commit-msg.sample

@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to check the commit log message.
-# Called by "git commit" with one argument, the name of the file
-# that has the commit message.  The hook should exit with non-zero
-# status after issuing an appropriate message if it wants to stop the
-# commit.  The hook is allowed to edit the commit message file.
-#
-# To enable this hook, rename this file to "commit-msg".
-
-# Uncomment the below to add a Signed-off-by line to the message.
-# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
-# hook is more suited to it.
-#
-# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
-# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
-
-# This example catches duplicate Signed-off-by lines.
-
-test "" = "$(grep '^Signed-off-by: ' "$1" |
-	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
-	echo >&2 Duplicate Signed-off-by lines.
-	exit 1
-}

integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/post-receive

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-ORI_DIR=`pwd`
-SHELL_FOLDER=$(cd "$(dirname "$0")";pwd)
-cd "$ORI_DIR"
-for i in `ls "$SHELL_FOLDER/post-receive.d"`; do
-    sh "$SHELL_FOLDER/post-receive.d/$i"
-done

integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/post-receive.d/gitea

@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-"$GITEA_ROOT/gitea" hook --config='integrations/app.ini' post-receive

integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/post-update.sample

@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to prepare a packed repository for use over
-# dumb transports.
-#
-# To enable this hook, rename this file to "post-update".
-
-exec git update-server-info

integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-applypatch.sample

@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to verify what is about to be committed
-# by applypatch from an e-mail message.
-#
-# The hook should exit with non-zero status after issuing an
-# appropriate message if it wants to stop the commit.
-#
-# To enable this hook, rename this file to "pre-applypatch".
-
-. git-sh-setup
-precommit="$(git rev-parse --git-path hooks/pre-commit)"
-test -x "$precommit" && exec "$precommit" ${1+"$@"}
-:

integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-commit.sample

@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to verify what is about to be committed.
-# Called by "git commit" with no arguments.  The hook should
-# exit with non-zero status after issuing an appropriate message if
-# it wants to stop the commit.
-#
-# To enable this hook, rename this file to "pre-commit".
-
-if git rev-parse --verify HEAD >/dev/null 2>&1
-then
-	against=HEAD
-else
-	# Initial commit: diff against an empty tree object
-	against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
-fi
-
-# If you want to allow non-ASCII filenames set this variable to true.
-allownonascii=$(git config --bool hooks.allownonascii)
-
-# Redirect output to stderr.
-exec 1>&2
-
-# Cross platform projects tend to avoid non-ASCII filenames; prevent
-# them from being added to the repository. We exploit the fact that the
-# printable range starts at the space character and ends with tilde.
-if [ "$allownonascii" != "true" ] &&
-	# Note that the use of brackets around a tr range is ok here, (it's
-	# even required, for portability to Solaris 10's /usr/bin/tr), since
-	# the square bracket bytes happen to fall in the designated range.
-	test $(git diff --cached --name-only --diff-filter=A -z $against |
-	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
-then
-	cat <<\EOF
-Error: Attempt to add a non-ASCII file name.
-
-This can cause problems if you want to work with people on other platforms.
-
-To be portable it is advisable to rename the file.
-
-If you know what you are doing you can disable this check using:
-
-  git config hooks.allownonascii true
-EOF
-	exit 1
-fi
-
-# If there are whitespace errors, print the offending file names and fail.
-exec git diff-index --check --cached $against --

integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-push.sample

@@ -1,53 +0,0 @@
-#!/bin/sh
-
-# An example hook script to verify what is about to be pushed.  Called by "git
-# push" after it has checked the remote status, but before anything has been
-# pushed.  If this script exits with a non-zero status nothing will be pushed.
-#
-# This hook is called with the following parameters:
-#
-# $1 -- Name of the remote to which the push is being done
-# $2 -- URL to which the push is being done
-#
-# If pushing without using a named remote those arguments will be equal.
-#
-# Information about the commits which are being pushed is supplied as lines to
-# the standard input in the form:
-#
-#   <local ref> <local sha1> <remote ref> <remote sha1>
-#
-# This sample shows how to prevent push of commits where the log message starts
-# with "WIP" (work in progress).
-
-remote="$1"
-url="$2"
-
-z40=0000000000000000000000000000000000000000
-
-while read local_ref local_sha remote_ref remote_sha
-do
-	if [ "$local_sha" = $z40 ]
-	then
-		# Handle delete
-		:
-	else
-		if [ "$remote_sha" = $z40 ]
-		then
-			# New branch, examine all commits
-			range="$local_sha"
-		else
-			# Update to existing branch, examine new commits
-			range="$remote_sha..$local_sha"
-		fi
-
-		# Check for WIP commit
-		commit=`git rev-list -n 1 --grep '^WIP' "$range"`
-		if [ -n "$commit" ]
-		then
-			echo >&2 "Found WIP commit in $local_ref, not pushing"
-			exit 1
-		fi
-	fi
-done
-
-exit 0

integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-rebase.sample

@@ -1,169 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2006, 2008 Junio C Hamano
-#
-# The "pre-rebase" hook is run just before "git rebase" starts doing
-# its job, and can prevent the command from running by exiting with
-# non-zero status.
-#
-# The hook is called with the following parameters:
-#
-# $1 -- the upstream the series was forked from.
-# $2 -- the branch being rebased (or empty when rebasing the current branch).
-#
-# This sample shows how to prevent topic branches that are already
-# merged to 'next' branch from getting rebased, because allowing it
-# would result in rebasing already published history.
-
-publish=next
-basebranch="$1"
-if test "$#" = 2
-then
-	topic="refs/heads/$2"
-else
-	topic=`git symbolic-ref HEAD` ||
-	exit 0 ;# we do not interrupt rebasing detached HEAD
-fi
-
-case "$topic" in
-refs/heads/??/*)
-	;;
-*)
-	exit 0 ;# we do not interrupt others.
-	;;
-esac
-
-# Now we are dealing with a topic branch being rebased
-# on top of master.  Is it OK to rebase it?
-
-# Does the topic really exist?
-git show-ref -q "$topic" || {
-	echo >&2 "No such branch $topic"
-	exit 1
-}
-
-# Is topic fully merged to master?
-not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
-if test -z "$not_in_master"
-then
-	echo >&2 "$topic is fully merged to master; better remove it."
-	exit 1 ;# we could allow it, but there is no point.
-fi
-
-# Is topic ever merged to next?  If so you should not be rebasing it.
-only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
-only_next_2=`git rev-list ^master           ${publish} | sort`
-if test "$only_next_1" = "$only_next_2"
-then
-	not_in_topic=`git rev-list "^$topic" master`
-	if test -z "$not_in_topic"
-	then
-		echo >&2 "$topic is already up-to-date with master"
-		exit 1 ;# we could allow it, but there is no point.
-	else
-		exit 0
-	fi
-else
-	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
-	/usr/bin/perl -e '
-		my $topic = $ARGV[0];
-		my $msg = "* $topic has commits already merged to public branch:\n";
-		my (%not_in_next) = map {
-			/^([0-9a-f]+) /;
-			($1 => 1);
-		} split(/\n/, $ARGV[1]);
-		for my $elem (map {
-				/^([0-9a-f]+) (.*)$/;
-				[$1 => $2];
-			} split(/\n/, $ARGV[2])) {
-			if (!exists $not_in_next{$elem->[0]}) {
-				if ($msg) {
-					print STDERR $msg;
-					undef $msg;
-				}
-				print STDERR " $elem->[1]\n";
-			}
-		}
-	' "$topic" "$not_in_next" "$not_in_master"
-	exit 1
-fi
-
-<<\DOC_END
-
-This sample hook safeguards topic branches that have been
-published from being rewound.
-
-The workflow assumed here is:
-
- * Once a topic branch forks from "master", "master" is never
-   merged into it again (either directly or indirectly).
-
- * Once a topic branch is fully cooked and merged into "master",
-   it is deleted.  If you need to build on top of it to correct
-   earlier mistakes, a new topic branch is created by forking at
-   the tip of the "master".  This is not strictly necessary, but
-   it makes it easier to keep your history simple.
-
- * Whenever you need to test or publish your changes to topic
-   branches, merge them into "next" branch.
-
-The script, being an example, hardcodes the publish branch name
-to be "next", but it is trivial to make it configurable via
-$GIT_DIR/config mechanism.
-
-With this workflow, you would want to know:
-
-(1) ... if a topic branch has ever been merged to "next".  Young
-    topic branches can have stupid mistakes you would rather
-    clean up before publishing, and things that have not been
-    merged into other branches can be easily rebased without
-    affecting other people.  But once it is published, you would
-    not want to rewind it.
-
-(2) ... if a topic branch has been fully merged to "master".
-    Then you can delete it.  More importantly, you should not
-    build on top of it -- other people may already want to
-    change things related to the topic as patches against your
-    "master", so if you need further changes, it is better to
-    fork the topic (perhaps with the same name) afresh from the
-    tip of "master".
-
-Let's look at this example:
-
-		   o---o---o---o---o---o---o---o---o---o "next"
-		  /       /           /           /
-		 /   a---a---b A     /           /
-		/   /               /           /
-	       /   /   c---c---c---c B         /
-	      /   /   /             \         /
-	     /   /   /   b---b C     \       /
-	    /   /   /   /             \     /
-    ---o---o---o---o---o---o---o---o---o---o---o "master"
-
-
-A, B and C are topic branches.
-
- * A has one fix since it was merged up to "next".
-
- * B has finished.  It has been fully merged up to "master" and "next",
-   and is ready to be deleted.
-
- * C has not merged to "next" at all.
-
-We would want to allow C to be rebased, refuse A, and encourage
-B to be deleted.
-
-To compute (1):
-
-	git rev-list ^master ^topic next
-	git rev-list ^master        next
-
-	if these match, topic has not merged in next at all.
-
-To compute (2):
-
-	git rev-list master..topic
-
-	if this is empty, it is fully merged to "master".
-
-DOC_END

integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-receive

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-ORI_DIR=`pwd`
-SHELL_FOLDER=$(cd "$(dirname "$0")";pwd)
-cd "$ORI_DIR"
-for i in `ls "$SHELL_FOLDER/pre-receive.d"`; do
-    sh "$SHELL_FOLDER/pre-receive.d/$i"
-done

integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-receive.d/gitea

@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-"$GITEA_ROOT/gitea" hook --config='integrations/app.ini' pre-receive

integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/prepare-commit-msg.sample

@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to prepare the commit log message.
-# Called by "git commit" with the name of the file that has the
-# commit message, followed by the description of the commit
-# message's source.  The hook's purpose is to edit the commit
-# message file.  If the hook fails with a non-zero status,
-# the commit is aborted.
-#
-# To enable this hook, rename this file to "prepare-commit-msg".
-
-# This hook includes three examples.  The first comments out the
-# "Conflicts:" part of a merge commit.
-#
-# The second includes the output of "git diff --name-status -r"
-# into the message, just before the "git status" output.  It is
-# commented because it doesn't cope with --amend or with squashed
-# commits.
-#
-# The third example adds a Signed-off-by line to the message, that can
-# still be edited.  This is rarely a good idea.
-
-case "$2,$3" in
-  merge,)
-    /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
-
-# ,|template,)
-#   /usr/bin/perl -i.bak -pe '
-#      print "\n" . `git diff --cached --name-status -r`
-#	 if /^#/ && $first++ == 0' "$1" ;;
-
-  *) ;;
-esac
-
-# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
-# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"

integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/update

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-ORI_DIR=`pwd`
-SHELL_FOLDER=$(cd "$(dirname "$0")";pwd)
-cd "$ORI_DIR"
-for i in `ls "$SHELL_FOLDER/update.d"`; do
-    sh "$SHELL_FOLDER/update.d/$i" $1 $2 $3
-done

integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/update.d/gitea

@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-"$GITEA_ROOT/gitea" hook --config='integrations/app.ini' update $1 $2 $3

integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/update.sample

@@ -1,128 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to block unannotated tags from entering.
-# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
-#
-# To enable this hook, rename this file to "update".
-#
-# Config
-# ------
-# hooks.allowunannotated
-#   This boolean sets whether unannotated tags will be allowed into the
-#   repository.  By default they won't be.
-# hooks.allowdeletetag
-#   This boolean sets whether deleting tags will be allowed in the
-#   repository.  By default they won't be.
-# hooks.allowmodifytag
-#   This boolean sets whether a tag may be modified after creation. By default
-#   it won't be.
-# hooks.allowdeletebranch
-#   This boolean sets whether deleting branches will be allowed in the
-#   repository.  By default they won't be.
-# hooks.denycreatebranch
-#   This boolean sets whether remotely creating branches will be denied
-#   in the repository.  By default this is allowed.
-#
-
-# --- Command line
-refname="$1"
-oldrev="$2"
-newrev="$3"
-
-# --- Safety check
-if [ -z "$GIT_DIR" ]; then
-	echo "Don't run this script from the command line." >&2
-	echo " (if you want, you could supply GIT_DIR then run" >&2
-	echo "  $0 <ref> <oldrev> <newrev>)" >&2
-	exit 1
-fi
-
-if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
-	echo "usage: $0 <ref> <oldrev> <newrev>" >&2
-	exit 1
-fi
-
-# --- Config
-allowunannotated=$(git config --bool hooks.allowunannotated)
-allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
-denycreatebranch=$(git config --bool hooks.denycreatebranch)
-allowdeletetag=$(git config --bool hooks.allowdeletetag)
-allowmodifytag=$(git config --bool hooks.allowmodifytag)
-
-# check for no description
-projectdesc=$(sed -e '1q' "$GIT_DIR/description")
-case "$projectdesc" in
-"Unnamed repository"* | "")
-	echo "*** Project description file hasn't been set" >&2
-	exit 1
-	;;
-esac
-
-# --- Check types
-# if $newrev is 0000...0000, it's a commit to delete a ref.
-zero="0000000000000000000000000000000000000000"
-if [ "$newrev" = "$zero" ]; then
-	newrev_type=delete
-else
-	newrev_type=$(git cat-file -t $newrev)
-fi
-
-case "$refname","$newrev_type" in
-	refs/tags/*,commit)
-		# un-annotated tag
-		short_refname=${refname##refs/tags/}
-		if [ "$allowunannotated" != "true" ]; then
-			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
-			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
-			exit 1
-		fi
-		;;
-	refs/tags/*,delete)
-		# delete tag
-		if [ "$allowdeletetag" != "true" ]; then
-			echo "*** Deleting a tag is not allowed in this repository" >&2
-			exit 1
-		fi
-		;;
-	refs/tags/*,tag)
-		# annotated tag
-		if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
-		then
-			echo "*** Tag '$refname' already exists." >&2
-			echo "*** Modifying a tag is not allowed in this repository." >&2
-			exit 1
-		fi
-		;;
-	refs/heads/*,commit)
-		# branch
-		if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
-			echo "*** Creating a branch is not allowed in this repository" >&2
-			exit 1
-		fi
-		;;
-	refs/heads/*,delete)
-		# delete branch
-		if [ "$allowdeletebranch" != "true" ]; then
-			echo "*** Deleting a branch is not allowed in this repository" >&2
-			exit 1
-		fi
-		;;
-	refs/remotes/*,commit)
-		# tracking branch
-		;;
-	refs/remotes/*,delete)
-		# delete tracking branch
-		if [ "$allowdeletebranch" != "true" ]; then
-			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
-			exit 1
-		fi
-		;;
-	*)
-		# Anything else (is there anything else?)
-		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
-		exit 1
-		;;
-esac
-
-# --- Finished
-exit 0

integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/info/exclude

@@ -1,6 +0,0 @@
-# git ls-files --others --exclude-from=.git/info/exclude
-# Lines that start with '#' are comments.
-# For a project mostly in C, the following would be a good set of
-# exclude patterns (uncomment them if you want to use them):
-# *.[oa]
-# *~

integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/info/refs

@@ -1 +0,0 @@
-65f1bf27bc3bf70f64657658635e66094edbcb4d	refs/heads/master

integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/objects/info/packs

@@ -1 +0,0 @@
-

integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/refs/heads/master

@@ -1 +0,0 @@
-65f1bf27bc3bf70f64657658635e66094edbcb4d

integrations/install_test.go

@@ -0,0 +1,91 @@
+// Copyright 2017 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package integration
+
+import (
+	"fmt"
+	"net/http"
+	"os"
+	"os/user"
+	"testing"
+	"time"
+
+	"code.gitea.io/gitea/integrations/internal/utils"
+)
+
+// The HTTP port listened by the Gitea server.
+const ServerHTTPPort = "3001"
+
+const _RetryLimit = 10
+
+func makeSimpleSettings(user, port string) map[string][]string {
+	return map[string][]string{
+		"db_type":        {"SQLite3"},
+		"db_host":        {"localhost"},
+		"db_path":        {"data/gitea.db"},
+		"app_name":       {"Gitea: Git with a cup of tea"},
+		"repo_root_path": {"repositories"},
+		"run_user":       {user},
+		"domain":         {"localhost"},
+		"ssh_port":       {"22"},
+		"http_port":      {port},
+		"app_url":        {"http://localhost:" + port},
+		"log_root_path":  {"log"},
+	}
+}
+
+func install(t *utils.T) error {
+	var r *http.Response
+	var err error
+
+	for i := 1; i <= _RetryLimit; i++ {
+
+		r, err = http.Get("http://:" + ServerHTTPPort + "/")
+		if err == nil {
+			fmt.Fprintln(os.Stderr)
+			break
+		}
+
+		// Give the server some amount of time to warm up.
+		time.Sleep(100 * time.Millisecond)
+		fmt.Fprint(os.Stderr, ".")
+	}
+
+	if err != nil {
+		return err
+	}
+
+	defer r.Body.Close()
+
+	_user, err := user.Current()
+	if err != nil {
+		return err
+	}
+
+	settings := makeSimpleSettings(_user.Username, ServerHTTPPort)
+	r, err = http.PostForm("http://:"+ServerHTTPPort+"/install", settings)
+	if err != nil {
+		return err
+	}
+	defer r.Body.Close()
+
+	if r.StatusCode != http.StatusOK {
+		return fmt.Errorf("'/install': %s", r.Status)
+	}
+	return nil
+}
+
+func TestInstall(t *testing.T) {
+	conf := utils.Config{
+		Program: "../gitea",
+		WorkDir: "",
+		Args:    []string{"web", "--port", ServerHTTPPort},
+		LogFile: os.Stderr,
+	}
+
+	if err := utils.New(t, &conf).RunTest(install); err != nil {
+		t.Fatal(err)
+	}
+}

integrations/integration_test.go

@@ -1,100 +0,0 @@
-// Copyright 2017 The Gitea Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package integrations
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"testing"
-
-	"code.gitea.io/gitea/models"
-	"code.gitea.io/gitea/modules/setting"
-	"code.gitea.io/gitea/routers"
-	"code.gitea.io/gitea/routers/routes"
-
-	"github.com/Unknwon/com"
-	"github.com/stretchr/testify/assert"
-	"gopkg.in/macaron.v1"
-	"gopkg.in/testfixtures.v2"
-)
-
-var mac *macaron.Macaron
-
-func TestMain(m *testing.M) {
-	appIniPath := os.Getenv("GITEA_CONF")
-	if appIniPath == "" {
-		fmt.Println("Environment variable $GITEA_CONF not set")
-		os.Exit(1)
-	}
-	setting.CustomConf = appIniPath
-	routers.GlobalInit()
-	mac = routes.NewMacaron()
-	routes.RegisterRoutes(mac)
-
-	var helper testfixtures.Helper
-	if setting.UseMySQL {
-		helper = &testfixtures.MySQL{}
-	} else if setting.UsePostgreSQL {
-		helper = &testfixtures.PostgreSQL{}
-	} else if setting.UseSQLite3 {
-		helper = &testfixtures.SQLite{}
-	} else {
-		fmt.Println("Unsupported RDBMS for integration tests")
-		os.Exit(1)
-	}
-
-	err := models.InitFixtures(
-		helper,
-		"models/fixtures/",
-	)
-	if err != nil {
-		fmt.Printf("Error initializing test database: %v\n", err)
-		os.Exit(1)
-	}
-	os.Exit(m.Run())
-}
-
-func prepareTestEnv(t *testing.T) {
-	assert.NoError(t, models.LoadFixtures())
-	assert.NoError(t, os.RemoveAll("integrations/gitea-integration"))
-	assert.NoError(t, com.CopyDir("integrations/gitea-integration-meta", "integrations/gitea-integration"))
-}
-
-type TestResponseWriter struct {
-	HeaderCode int
-	Writer     io.Writer
-}
-
-func (w *TestResponseWriter) Header() http.Header {
-	return make(map[string][]string)
-}
-
-func (w *TestResponseWriter) Write(b []byte) (int, error) {
-	return w.Writer.Write(b)
-}
-
-func (w *TestResponseWriter) WriteHeader(n int) {
-	w.HeaderCode = n
-}
-
-type TestResponse struct {
-	HeaderCode int
-	Body       []byte
-}
-
-func MakeRequest(req *http.Request) *TestResponse {
-	buffer := bytes.NewBuffer(nil)
-	respWriter := &TestResponseWriter{
-		Writer: buffer,
-	}
-	mac.ServeHTTP(respWriter, req)
-	return &TestResponse{
-		HeaderCode: respWriter.HeaderCode,
-		Body:       buffer.Bytes(),
-	}
-}

integrations/internal/utils/utils.go

@@ -0,0 +1,125 @@
+// Copyright 2017 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package utils
+
+import (
+	"errors"
+	"io"
+	"io/ioutil"
+	"log"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"syscall"
+	"testing"
+)
+
+// T wraps testing.T and the configurations of the testing instance.
+type T struct {
+	*testing.T
+	Config *Config
+}
+
+// New create an instance of T
+func New(t *testing.T, c *Config) *T {
+	return &T{T: t, Config: c}
+}
+
+// Config Settings of the testing program
+type Config struct {
+	// The executable path of the tested program.
+	Program string
+	// Working directory prepared for the tested program.
+	// If empty, a directory named with random suffixes is picked, and created under the platform-dependent default temporary directory.
+	// The directory will be removed when the test finishes.
+	WorkDir string
+	// Command-line arguments passed to the tested program.
+	Args []string
+
+	// Where to redirect the stdout/stderr to. For debugging purposes.
+	LogFile *os.File
+}
+
+func redirect(cmd *exec.Cmd, f *os.File) error {
+	stdout, err := cmd.StdoutPipe()
+	if err != nil {
+		return err
+	}
+
+	stderr, err := cmd.StderrPipe()
+	if err != nil {
+		return err
+	}
+
+	go io.Copy(f, stdout)
+	go io.Copy(f, stderr)
+	return nil
+}
+
+// RunTest Helper function for setting up a running Gitea server for functional testing and then gracefully terminating it.
+func (t *T) RunTest(tests ...func(*T) error) (err error) {
+	if t.Config.Program == "" {
+		return errors.New("Need input file")
+	}
+
+	path, err := filepath.Abs(t.Config.Program)
+	if err != nil {
+		return err
+	}
+
+	workdir := t.Config.WorkDir
+	if workdir == "" {
+		workdir, err = ioutil.TempDir(os.TempDir(), "gitea_tests-")
+		if err != nil {
+			return err
+		}
+		defer os.RemoveAll(workdir)
+	}
+
+	newpath := filepath.Join(workdir, filepath.Base(path))
+	if err := os.Symlink(path, newpath); err != nil {
+		return err
+	}
+
+	log.Printf("Starting the server: %s args:%s workdir:%s", newpath, t.Config.Args, workdir)
+
+	cmd := exec.Command(newpath, t.Config.Args...)
+	cmd.Dir = workdir
+
+	if t.Config.LogFile != nil && testing.Verbose() {
+		if err := redirect(cmd, t.Config.LogFile); err != nil {
+			return err
+		}
+	}
+
+	if err := cmd.Start(); err != nil {
+		return err
+	}
+
+	log.Println("Server started.")
+
+	defer func() {
+		// Do not early return. We have to call Wait anyway.
+		_ = cmd.Process.Signal(syscall.SIGTERM)
+
+		if _err := cmd.Wait(); _err != nil {
+			if _err.Error() != "signal: terminated" {
+				err = _err
+				return
+			}
+		}
+
+		log.Println("Server exited")
+	}()
+
+	for _, fn := range tests {
+		if err := fn(t); err != nil {
+			return err
+		}
+	}
+
+	// Note that the return value 'err' may be updated by the 'defer' statement before despite it's returning nil here.
+	return nil
+}

integrations/mysql.ini

@@ -1,56 +0,0 @@
-APP_NAME = Gitea: Git with a cup of tea
-RUN_MODE = prod
-
-[database]
-DB_TYPE  = mysql
-HOST     = 127.0.0.1:3306
-NAME     = testgitea
-USER     = root
-PASSWD   =
-SSL_MODE = disable
-PATH     = data/gitea.db
-
-[repository]
-ROOT = integrations/gitea-integration/gitea-repositories
-
-[server]
-SSH_DOMAIN       = localhost
-HTTP_PORT        = 3000
-ROOT_URL         = http://localhost:3000/
-DISABLE_SSH      = false
-SSH_PORT         = 22
-LFS_START_SERVER = false
-OFFLINE_MODE     = false
-
-[mailer]
-ENABLED = false
-
-[service]
-REGISTER_EMAIL_CONFIRM     = false
-ENABLE_NOTIFY_MAIL         = false
-DISABLE_REGISTRATION       = false
-ENABLE_CAPTCHA             = false
-REQUIRE_SIGNIN_VIEW        = false
-DEFAULT_KEEP_EMAIL_PRIVATE = false
-NO_REPLY_ADDRESS           = noreply.example.org
-
-[picture]
-DISABLE_GRAVATAR        = false
-ENABLE_FEDERATED_AVATAR = false
-
-[session]
-PROVIDER = file
-
-[log]
-MODE = console,file
-
-[log.console]
-LEVEL = Warn
-
-[log.file]
-LEVEL     = Info
-ROOT_PATH = log
-
-[security]
-INSTALL_LOCK = true
-SECRET_KEY   = 9pCviYTWSb

integrations/pgsql.ini

@@ -1,56 +0,0 @@
-APP_NAME = Gitea: Git with a cup of tea
-RUN_MODE = prod
-
-[database]
-DB_TYPE  = postgres
-HOST     = 127.0.0.1:5432
-NAME     = testgitea
-USER     = postgres
-PASSWD   = postgres
-SSL_MODE = disable
-PATH     = data/gitea.db
-
-[repository]
-ROOT = integrations/gitea-integration/gitea-repositories
-
-[server]
-SSH_DOMAIN       = localhost
-HTTP_PORT        = 3000
-ROOT_URL         = http://localhost:3000/
-DISABLE_SSH      = false
-SSH_PORT         = 22
-LFS_START_SERVER = false
-OFFLINE_MODE     = false
-
-[mailer]
-ENABLED = false
-
-[service]
-REGISTER_EMAIL_CONFIRM     = false
-ENABLE_NOTIFY_MAIL         = false
-DISABLE_REGISTRATION       = false
-ENABLE_CAPTCHA             = false
-REQUIRE_SIGNIN_VIEW        = false
-DEFAULT_KEEP_EMAIL_PRIVATE = false
-NO_REPLY_ADDRESS           = noreply.example.org
-
-[picture]
-DISABLE_GRAVATAR        = false
-ENABLE_FEDERATED_AVATAR = false
-
-[session]
-PROVIDER = file
-
-[log]
-MODE = console,file
-
-[log.console]
-LEVEL = Warn
-
-[log.file]
-LEVEL     = Info
-ROOT_PATH = log
-
-[security]
-INSTALL_LOCK = true
-SECRET_KEY   = 9pCviYTWSb

integrations/signup_test.go

@@ -1,41 +0,0 @@
-// Copyright 2017 The Gitea Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package integrations
-
-import (
-	"bytes"
-	"net/http"
-	"net/url"
-	"testing"
-
-	"code.gitea.io/gitea/modules/setting"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestSignup(t *testing.T) {
-	prepareTestEnv(t)
-
-	setting.Service.EnableCaptcha = false
-
-	req, err := http.NewRequest("POST", "/user/sign_up",
-		bytes.NewBufferString(url.Values{
-			"user_name": []string{"exampleUser"},
-			"email":     []string{"exampleUser@example.com"},
-			"password":  []string{"examplePassword"},
-			"retype":    []string{"examplePassword"},
-		}.Encode()),
-	)
-	assert.NoError(t, err)
-	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
-	resp := MakeRequest(req)
-	assert.EqualValues(t, http.StatusFound, resp.HeaderCode)
-
-	// should be able to view new user's page
-	req, err = http.NewRequest("GET", "/exampleUser", nil)
-	assert.NoError(t, err)
-	resp = MakeRequest(req)
-	assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
-}

integrations/sqlite.ini

@@ -1,58 +0,0 @@
-APP_NAME = Gitea: Git with a cup of tea
-RUN_MODE = prod
-
-[database]
-DB_TYPE  = sqlite3
-HOST     = 127.0.0.1:3306
-NAME     = testgitea
-USER     = gitea
-PASSWD   =
-SSL_MODE = disable
-PATH     = :memory:
-
-[repository]
-ROOT = integrations/gitea-integration/gitea-repositories
-
-[server]
-SSH_DOMAIN       = localhost
-HTTP_PORT        = 3000
-ROOT_URL         = http://localhost:3000/
-DISABLE_SSH      = false
-SSH_PORT         = 22
-LFS_START_SERVER = false
-OFFLINE_MODE     = false
-
-[mailer]
-ENABLED = false
-
-[service]
-REGISTER_EMAIL_CONFIRM     = false
-ENABLE_NOTIFY_MAIL         = false
-DISABLE_REGISTRATION       = false
-ENABLE_CAPTCHA             = false
-REQUIRE_SIGNIN_VIEW        = false
-DEFAULT_KEEP_EMAIL_PRIVATE = false
-NO_REPLY_ADDRESS           = noreply.example.org
-
-[picture]
-DISABLE_GRAVATAR        = false
-ENABLE_FEDERATED_AVATAR = false
-
-[session]
-PROVIDER = file
-
-[log]
-MODE = console,file
-
-[log.console]
-LEVEL = Warn
-
-[log.file]
-LEVEL     = Info
-ROOT_PATH = log
-
-[security]
-INSTALL_LOCK   = true
-SECRET_KEY     = 9pCviYTWSb
-INTERNAL_TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYmYiOjE0OTI3OTU5ODN9.OQkH5UmzID2XBdwQ9TAI6Jj2t1X-wElVTjbE7aoN4I8
-

integrations/version_test.go

@@ -2,32 +2,81 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-package integrations
+package integration
 
 import (
-	"bytes"
 	"encoding/json"
+	"fmt"
+	"log"
 	"net/http"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
 	"testing"
 
-	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/integrations/internal/utils"
 	"code.gitea.io/sdk/gitea"
 
 	"github.com/stretchr/testify/assert"
 )
 
-func TestVersion(t *testing.T) {
-	prepareTestEnv(t)
+func version(t *utils.T) error {
+	var err error
 
-	setting.AppVer = "1.1.0+dev"
-	req, err := http.NewRequest("GET", "/api/v1/version", nil)
-	assert.NoError(t, err)
-	resp := MakeRequest(req)
+	path, err := filepath.Abs(t.Config.Program)
+	if err != nil {
+		return err
+	}
 
-	var version gitea.ServerVersion
-	decoder := json.NewDecoder(bytes.NewBuffer(resp.Body))
-	assert.NoError(t, decoder.Decode(&version))
+	cmd := exec.Command(path, "--version")
+	out, err := cmd.Output()
+	if err != nil {
+		return err
+	}
 
-	assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
-	assert.Equal(t, setting.AppVer, string(version.Version))
+	fields := strings.Fields(string(out))
+	if !strings.HasPrefix(string(out), "Gitea version") {
+		return fmt.Errorf("unexpected version string '%s' of the gitea executable", out)
+	}
+
+	expected := fields[2]
+
+	var r *http.Response
+	r, err = http.Get("http://:" + ServerHTTPPort + "/api/v1/version")
+	if err != nil {
+		return err
+	}
+	defer r.Body.Close()
+
+	if r.StatusCode != http.StatusOK {
+		return fmt.Errorf("'/api/v1/version': %s\n", r.Status)
+	}
+
+	var v gitea.ServerVersion
+
+	dec := json.NewDecoder(r.Body)
+	if err := dec.Decode(&v); err != nil {
+		return err
+	}
+
+	actual := v.Version
+
+	log.Printf("Actual: \"%s\" Expected: \"%s\"\n", actual, expected)
+	assert.Equal(t, expected, actual)
+
+	return nil
+}
+
+func TestVersion(t *testing.T) {
+	conf := utils.Config{
+		Program: "../gitea",
+		WorkDir: "",
+		Args:    []string{"web", "--port", ServerHTTPPort},
+		LogFile: os.Stderr,
+	}
+
+	if err := utils.New(t, &conf).RunTest(install, version); err != nil {
+		t.Fatal(err)
+	}
 }

integrations/view_test.go

@@ -1,30 +0,0 @@
-// Copyright 2017 The Gitea Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package integrations
-
-import (
-	"net/http"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestViewRepo(t *testing.T) {
-	prepareTestEnv(t)
-
-	req, err := http.NewRequest("GET", "/user2/repo1", nil)
-	assert.NoError(t, err)
-	resp := MakeRequest(req)
-	assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
-}
-
-func TestViewUser(t *testing.T) {
-	prepareTestEnv(t)
-
-	req, err := http.NewRequest("GET", "/user2", nil)
-	assert.NoError(t, err)
-	resp := MakeRequest(req)
-	assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
-}

main.go

@@ -36,11 +36,9 @@ func main() {
 		cmd.CmdWeb,
 		cmd.CmdServ,
 		cmd.CmdHook,
+		cmd.CmdDump,
 		cmd.CmdCert,
 		cmd.CmdAdmin,
-		cmd.Backup,
-		cmd.Restore,
-		cmd.Dump,
 	}
 	app.Flags = append(app.Flags, []cli.Flag{}...)
 	err := app.Run(os.Args)

models/access.go

@@ -59,21 +59,21 @@ type Access struct {
 	Mode   AccessMode
 }
 
-func accessLevel(e Engine, userID int64, repo *Repository) (AccessMode, error) {
+func accessLevel(e Engine, user *User, repo *Repository) (AccessMode, error) {
 	mode := AccessModeNone
 	if !repo.IsPrivate {
 		mode = AccessModeRead
 	}
 
-	if userID == 0 {
+	if user == nil {
 		return mode, nil
 	}
 
-	if userID == repo.OwnerID {
+	if user.ID == repo.OwnerID {
 		return AccessModeOwner, nil
 	}
 
-	a := &Access{UserID: userID, RepoID: repo.ID}
+	a := &Access{UserID: user.ID, RepoID: repo.ID}
 	if has, err := e.Get(a); !has || err != nil {
 		return mode, err
 	}
@@ -81,19 +81,19 @@ func accessLevel(e Engine, userID int64, repo *Repository) (AccessMode, error) {
 }
 
 // AccessLevel returns the Access a user has to a repository. Will return NoneAccess if the
-// user does not have access.
-func AccessLevel(userID int64, repo *Repository) (AccessMode, error) {
-	return accessLevel(x, userID, repo)
+// user does not have access. User can be nil!
+func AccessLevel(user *User, repo *Repository) (AccessMode, error) {
+	return accessLevel(x, user, repo)
 }
 
-func hasAccess(e Engine, userID int64, repo *Repository, testMode AccessMode) (bool, error) {
-	mode, err := accessLevel(e, userID, repo)
+func hasAccess(e Engine, user *User, repo *Repository, testMode AccessMode) (bool, error) {
+	mode, err := accessLevel(e, user, repo)
 	return testMode <= mode, err
 }
 
-// HasAccess returns true if user has access to repo
-func HasAccess(userID int64, repo *Repository, testMode AccessMode) (bool, error) {
-	return hasAccess(x, userID, repo, testMode)
+// HasAccess returns true if someone has the request access level. User can be nil!
+func HasAccess(user *User, repo *Repository, testMode AccessMode) (bool, error) {
+	return hasAccess(x, user, repo, testMode)
 }
 
 type repoAccess struct {

models/access_test.go

@@ -25,19 +25,19 @@ func TestAccessLevel(t *testing.T) {
 	repo1 := AssertExistsAndLoadBean(t, &Repository{OwnerID: 2, IsPrivate: false}).(*Repository)
 	repo2 := AssertExistsAndLoadBean(t, &Repository{OwnerID: 3, IsPrivate: true}).(*Repository)
 
-	level, err := AccessLevel(user1.ID, repo1)
+	level, err := AccessLevel(user1, repo1)
 	assert.NoError(t, err)
 	assert.Equal(t, AccessModeOwner, level)
 
-	level, err = AccessLevel(user1.ID, repo2)
+	level, err = AccessLevel(user1, repo2)
 	assert.NoError(t, err)
 	assert.Equal(t, AccessModeWrite, level)
 
-	level, err = AccessLevel(user2.ID, repo1)
+	level, err = AccessLevel(user2, repo1)
 	assert.NoError(t, err)
 	assert.Equal(t, AccessModeRead, level)
 
-	level, err = AccessLevel(user2.ID, repo2)
+	level, err = AccessLevel(user2, repo2)
 	assert.NoError(t, err)
 	assert.Equal(t, AccessModeNone, level)
 }
@@ -51,19 +51,19 @@ func TestHasAccess(t *testing.T) {
 	repo2 := AssertExistsAndLoadBean(t, &Repository{OwnerID: 3, IsPrivate: true}).(*Repository)
 
 	for _, accessMode := range accessModes {
-		has, err := HasAccess(user1.ID, repo1, accessMode)
+		has, err := HasAccess(user1, repo1, accessMode)
 		assert.NoError(t, err)
 		assert.True(t, has)
 
-		has, err = HasAccess(user1.ID, repo2, accessMode)
+		has, err = HasAccess(user1, repo2, accessMode)
 		assert.NoError(t, err)
 		assert.Equal(t, accessMode <= AccessModeWrite, has)
 
-		has, err = HasAccess(user2.ID, repo1, accessMode)
+		has, err = HasAccess(user2, repo1, accessMode)
 		assert.NoError(t, err)
 		assert.Equal(t, accessMode <= AccessModeRead, has)
 
-		has, err = HasAccess(user2.ID, repo2, accessMode)
+		has, err = HasAccess(user2, repo2, accessMode)
 		assert.NoError(t, err)
 		assert.Equal(t, accessMode <= AccessModeNone, has)
 	}

models/admin.go

@@ -6,13 +6,16 @@ package models
 
 import (
 	"fmt"
+	"os"
+	"os/exec"
+	"strings"
 	"time"
 
-	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/modules/util"
-
 	"github.com/Unknwon/com"
 	"github.com/go-xorm/xorm"
+
+	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/setting"
 )
 
 //NoticeType describes the notice type
@@ -76,7 +79,19 @@ func RemoveAllWithNotice(title, path string) {
 }
 
 func removeAllWithNotice(e Engine, title, path string) {
-	if err := util.RemoveAll(path); err != nil {
+	var err error
+	// workaround for Go not being able to remove read-only files/folders: https://github.com/golang/go/issues/9606
+	// this bug should be fixed on Go 1.7, so the workaround should be removed when Gogs don't support Go 1.6 anymore:
+	// https://github.com/golang/go/commit/2ffb3e5d905b5622204d199128dec06cefd57790
+	if setting.IsWindows {
+		// converting "/" to "\" in path on Windows
+		path = strings.Replace(path, "/", "\\", -1)
+		err = exec.Command("cmd", "/C", "rmdir", "/S", "/Q", path).Run()
+	} else {
+		err = os.RemoveAll(path)
+	}
+
+	if err != nil {
 		desc := fmt.Sprintf("%s [%s]: %v", title, path, err)
 		log.Warn(desc)
 		if err = createNotice(e, NoticeRepository, desc); err != nil {

models/attachment.go

@@ -20,15 +20,15 @@ import (
 
 // Attachment represent a attachment of issue/comment/release.
 type Attachment struct {
-	ID            int64  `xorm:"pk autoincr"`
-	UUID          string `xorm:"uuid UNIQUE"`
-	IssueID       int64  `xorm:"INDEX"`
-	ReleaseID     int64  `xorm:"INDEX"`
-	CommentID     int64
-	Name          string
-	DownloadCount int64     `xorm:"DEFAULT 0"`
-	Created       time.Time `xorm:"-"`
-	CreatedUnix   int64
+	ID        int64  `xorm:"pk autoincr"`
+	UUID      string `xorm:"uuid UNIQUE"`
+	IssueID   int64  `xorm:"INDEX"`
+	CommentID int64
+	ReleaseID int64 `xorm:"INDEX"`
+	Name      string
+
+	Created     time.Time `xorm:"-"`
+	CreatedUnix int64
 }
 
 // BeforeInsert is invoked from XORM before inserting an object of this type.
@@ -45,19 +45,6 @@ func (a *Attachment) AfterSet(colName string, _ xorm.Cell) {
 	}
 }
 
-// IncreaseDownloadCount is update download count + 1
-func (a *Attachment) IncreaseDownloadCount() error {
-	sess := x.NewSession()
-	defer sessionRelease(sess)
-
-	// Update download count.
-	if _, err := sess.Exec("UPDATE `attachment` SET download_count=download_count+1 WHERE id=?", a.ID); err != nil {
-		return fmt.Errorf("increase attachment count: %v", err)
-	}
-
-	return nil
-}
-
 // AttachmentLocalPath returns where attachment is stored in local file
 // system based on given UUID.
 func AttachmentLocalPath(uuid string) string {

models/attachment_test.go

@@ -1,60 +0,0 @@
-// Copyright 2017 The Gitea Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package models
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestIncreaseDownloadCount(t *testing.T) {
-	assert.NoError(t, PrepareTestDatabase())
-
-	attachment, err := GetAttachmentByUUID("1234567890")
-	assert.NoError(t, err)
-	assert.Equal(t, int64(0), attachment.DownloadCount)
-
-	// increase download count
-	err = attachment.IncreaseDownloadCount()
-	assert.NoError(t, err)
-
-	attachment, err = GetAttachmentByUUID("1234567890")
-	assert.NoError(t, err)
-	assert.Equal(t, int64(1), attachment.DownloadCount)
-}
-
-func TestGetByCommentOrIssueID(t *testing.T) {
-	assert.NoError(t, PrepareTestDatabase())
-
-	// count of attachments from issue ID
-	attachments, err := GetAttachmentsByIssueID(1)
-	assert.NoError(t, err)
-	assert.Equal(t, 2, len(attachments))
-
-	attachments, err = GetAttachmentsByCommentID(1)
-	assert.NoError(t, err)
-	assert.Equal(t, 2, len(attachments))
-}
-
-func TestDeleteAttachments(t *testing.T) {
-	assert.NoError(t, PrepareTestDatabase())
-
-	count, err := DeleteAttachmentsByIssue(4, false)
-	assert.NoError(t, err)
-	assert.Equal(t, 1, count)
-
-	count, err = DeleteAttachmentsByComment(2, false)
-	assert.NoError(t, err)
-	assert.Equal(t, 2, count)
-
-	err = DeleteAttachment(&Attachment{ID: 8}, false)
-	assert.NoError(t, err)
-
-	attachment, err := GetAttachmentByUUID("test-12345")
-	assert.Error(t, err)
-	assert.True(t, IsErrAttachmentNotExist(err))
-	assert.Nil(t, attachment)
-}

models/branches.go

@@ -57,7 +57,7 @@ func GetProtectedBranchBy(repoID int64, BranchName string) (*ProtectedBranch, er
 	return rel, nil
 }
 
-// GetProtectedBranches get all protected branches
+// GetProtectedBranches get all protected btanches
 func (repo *Repository) GetProtectedBranches() ([]*ProtectedBranch, error) {
 	protectedBranches := make([]*ProtectedBranch, 0)
 	return protectedBranches, x.Find(&protectedBranches, &ProtectedBranch{RepoID: repo.ID})

models/error.go

@@ -93,21 +93,6 @@ func (err ErrEmailAlreadyUsed) Error() string {
 	return fmt.Sprintf("e-mail has been used [email: %s]", err.Email)
 }
 
-// ErrOpenIDAlreadyUsed represents a "OpenIDAlreadyUsed" kind of error.
-type ErrOpenIDAlreadyUsed struct {
-	OpenID string
-}
-
-// IsErrOpenIDAlreadyUsed checks if an error is a ErrOpenIDAlreadyUsed.
-func IsErrOpenIDAlreadyUsed(err error) bool {
-	_, ok := err.(ErrOpenIDAlreadyUsed)
-	return ok
-}
-
-func (err ErrOpenIDAlreadyUsed) Error() string {
-	return fmt.Sprintf("OpenID has been used [oid: %s]", err.OpenID)
-}
-
 // ErrUserOwnRepos represents a "UserOwnRepos" kind of error.
 type ErrUserOwnRepos struct {
 	UID int64
@@ -260,84 +245,6 @@ func (err ErrKeyNameAlreadyUsed) Error() string {
 	return fmt.Sprintf("public key already exists [owner_id: %d, name: %s]", err.OwnerID, err.Name)
 }
 
-// ErrGPGEmailNotFound represents a "ErrGPGEmailNotFound" kind of error.
-type ErrGPGEmailNotFound struct {
-	Email string
-}
-
-// IsErrGPGEmailNotFound checks if an error is a ErrGPGEmailNotFound.
-func IsErrGPGEmailNotFound(err error) bool {
-	_, ok := err.(ErrGPGEmailNotFound)
-	return ok
-}
-
-func (err ErrGPGEmailNotFound) Error() string {
-	return fmt.Sprintf("failed to found email or is not confirmed : %s", err.Email)
-}
-
-// ErrGPGKeyParsing represents a "ErrGPGKeyParsing" kind of error.
-type ErrGPGKeyParsing struct {
-	ParseError error
-}
-
-// IsErrGPGKeyParsing checks if an error is a ErrGPGKeyParsing.
-func IsErrGPGKeyParsing(err error) bool {
-	_, ok := err.(ErrGPGKeyParsing)
-	return ok
-}
-
-func (err ErrGPGKeyParsing) Error() string {
-	return fmt.Sprintf("failed to parse gpg key %s", err.ParseError.Error())
-}
-
-// ErrGPGKeyNotExist represents a "GPGKeyNotExist" kind of error.
-type ErrGPGKeyNotExist struct {
-	ID int64
-}
-
-// IsErrGPGKeyNotExist checks if an error is a ErrGPGKeyNotExist.
-func IsErrGPGKeyNotExist(err error) bool {
-	_, ok := err.(ErrGPGKeyNotExist)
-	return ok
-}
-
-func (err ErrGPGKeyNotExist) Error() string {
-	return fmt.Sprintf("public gpg key does not exist [id: %d]", err.ID)
-}
-
-// ErrGPGKeyIDAlreadyUsed represents a "GPGKeyIDAlreadyUsed" kind of error.
-type ErrGPGKeyIDAlreadyUsed struct {
-	KeyID string
-}
-
-// IsErrGPGKeyIDAlreadyUsed checks if an error is a ErrKeyNameAlreadyUsed.
-func IsErrGPGKeyIDAlreadyUsed(err error) bool {
-	_, ok := err.(ErrGPGKeyIDAlreadyUsed)
-	return ok
-}
-
-func (err ErrGPGKeyIDAlreadyUsed) Error() string {
-	return fmt.Sprintf("public key already exists [key_id: %s]", err.KeyID)
-}
-
-// ErrGPGKeyAccessDenied represents a "GPGKeyAccessDenied" kind of Error.
-type ErrGPGKeyAccessDenied struct {
-	UserID int64
-	KeyID  int64
-}
-
-// IsErrGPGKeyAccessDenied checks if an error is a ErrGPGKeyAccessDenied.
-func IsErrGPGKeyAccessDenied(err error) bool {
-	_, ok := err.(ErrGPGKeyAccessDenied)
-	return ok
-}
-
-// Error pretty-prints an error of type ErrGPGKeyAccessDenied.
-func (err ErrGPGKeyAccessDenied) Error() string {
-	return fmt.Sprintf("user does not have access to the key [user_id: %d, key_id: %d]",
-		err.UserID, err.KeyID)
-}
-
 // ErrKeyAccessDenied represents a "KeyAccessDenied" kind of error.
 type ErrKeyAccessDenied struct {
 	UserID int64

models/fixtures/attachment.yml

@@ -1,71 +0,0 @@
--
-  id: 1
-  uuid: 1234567890
-  issue_id: 1
-  comment_id: 0
-  name: attach1
-  download_count: 0
-  created_unix: 946684800
-
--
-  id: 2
-  uuid: 1122334455
-  issue_id: 1
-  comment_id: 0
-  name: attach2
-  download_count: 1
-  created_unix: 946684800
-
--
-  id: 3
-  uuid: comment-id-1
-  issue_id: 2
-  comment_id: 1
-  name: attach1
-  download_count: 0
-  created_unix: 946684800
-
--
-  id: 4
-  uuid: comment-id-2
-  issue_id: 3
-  comment_id: 1
-  name: attach2
-  download_count: 1
-  created_unix: 946684800
-
--
-  id: 5
-  uuid: comment-id-3
-  issue_id: 4
-  comment_id: 0
-  name: attach1
-  download_count: 0
-  created_unix: 946684800
-
--
-  id: 6
-  uuid: comment-id-4
-  issue_id: 5
-  comment_id: 2
-  name: attach1
-  download_count: 0
-  created_unix: 946684800
-
--
-  id: 7
-  uuid: comment-id-5
-  issue_id: 5
-  comment_id: 2
-  name: attach1
-  download_count: 0
-  created_unix: 946684800
-
--
-  id: 8
-  uuid: test-12345
-  issue_id: 6
-  comment_id: 0
-  name: attach1
-  download_count: 0
-  created_unix: 946684800

models/fixtures/comment.yml

@@ -2,18 +2,6 @@
   id: 1
   type: 7 # label
   poster_id: 2
-  issue_id: 1 # in repo_id 1
+  issue_id: 1
   label_id: 1
   content: "1"
--
-  id: 2
-  type: 0 # comment
-  poster_id: 3 # user not watching (see watch.yml)
-  issue_id: 1 # in repo_id 1
-  content: "good work!"
--
-  id: 3
-  type: 0 # comment
-  poster_id: 5 # user not watching (see watch.yml)
-  issue_id: 1 # in repo_id 1
-  content: "meh..."

models/fixtures/commit_status.yml

@@ -1,54 +0,0 @@
--
-  id: 1
-  index: 1
-  repo_id: 1
-  state: "pending"
-  sha: "1234123412341234123412341234123412341234"
-  target_url: https://example.com/builds/
-  description: My awesome CI-service
-  context: ci/awesomeness
-  creator_id: 2
-
--
-  id: 2
-  index: 2
-  repo_id: 1
-  state: "warning"
-  sha: "1234123412341234123412341234123412341234"
-  target_url: https://example.com/converage/
-  description: My awesome Coverage service
-  context: cov/awesomeness
-  creator_id: 2
-
--
-  id: 3
-  index: 3
-  repo_id: 1
-  state: "success"
-  sha: "1234123412341234123412341234123412341234"
-  target_url: https://example.com/converage/
-  description: My awesome Coverage service
-  context: cov/awesomeness
-  creator_id: 2
-
--
-  id: 4
-  index: 4
-  repo_id: 1
-  state: "failure"
-  sha: "1234123412341234123412341234123412341234"
-  target_url: https://example.com/builds/
-  description: My awesome CI-service
-  context: ci/awesomeness
-  creator_id: 2
-
--
-  id: 5
-  index: 5
-  repo_id: 1
-  state: "error"
-  sha: "1234123412341234123412341234123412341234"
-  target_url: https://example.com/builds/
-  description: My awesome deploy service
-  context: deploy/awesomeness
-  creator_id: 2

models/fixtures/follow.yml

@@ -1,4 +0,0 @@
--
-  id: 1
-  user_id: 4
-  follow_id: 2

models/fixtures/issue.yml

@@ -8,7 +8,7 @@
   content: content1
   is_closed: false
   is_pull: false
-  num_comments: 2
+  num_comments: 0
   created_unix: 946684800
   updated_unix: 978307200
 

models/fixtures/issue_watch.yml

@@ -1,15 +0,0 @@
--
-  id: 1
-  user_id: 1
-  issue_id: 1
-  is_watching: true
-  created_unix: 946684800
-  updated_unix: 946684800
-
--
-  id: 2
-  user_id: 2
-  issue_id: 2
-  is_watching: false
-  created_unix: 946684800
-  updated_unix: 946684800

models/fixtures/user.yml

@@ -26,7 +26,6 @@
   avatar_email: user2@example.com
   num_repos: 2
   num_stars: 2
-  num_followers: 1
 
 -
   id: 3
@@ -57,7 +56,6 @@
   avatar: avatar4
   avatar_email: user4@example.com
   num_repos: 0
-  num_following: 1
 
 -
   id: 5
@@ -74,7 +72,6 @@
   num_repos: 1
   allow_create_organization: false
   is_active: true
-  num_following: 0
 
 -
   id: 6

models/fixtures/user_open_id.yml

@@ -1,17 +0,0 @@
--
-  id: 1
-  uid: 1
-  uri: https://user1.domain1.tld/
-  show: false
-
--
-  id: 2
-  uid: 1
-  uri: http://user1.domain2.tld/
-  show: true
-
--
-  id: 3
-  uid: 2
-  uri: https://domain1.tld/user2/
-  show: true

models/git_diff.go

@@ -287,6 +287,7 @@ func ParsePatch(maxLines, maxLineCharacters, maxFiles int, reader io.Reader) (*D
 					curFile.IsBin = true
 					curFile.IsLFSFile = true
 					curSection.Lines = nil
+					break
 				}
 			}
 		}
@@ -365,10 +366,12 @@ func ParsePatch(maxLines, maxLineCharacters, maxFiles int, reader io.Reader) (*D
 			}
 
 			curFile = &DiffFile{
-				Name:     a,
-				Index:    len(diff.Files) + 1,
-				Type:     DiffFileChange,
-				Sections: make([]*DiffSection, 0, 10),
+				Name:      b,
+				OldName:   a,
+				Index:     len(diff.Files) + 1,
+				Type:      DiffFileChange,
+				Sections:  make([]*DiffSection, 0, 10),
+				IsRenamed: a != b,
 			}
 			diff.Files = append(diff.Files, curFile)
 			if len(diff.Files) >= maxFiles {
@@ -401,9 +404,6 @@ func ParsePatch(maxLines, maxLineCharacters, maxFiles int, reader io.Reader) (*D
 					curFile.Type = DiffFileChange
 				case strings.HasPrefix(line, "similarity index 100%"):
 					curFile.Type = DiffFileRename
-					curFile.IsRenamed = true
-					curFile.OldName = curFile.Name
-					curFile.Name = b
 				}
 				if curFile.Type > 0 {
 					if strings.HasSuffix(line, " 160000\n") {

models/gpg_key.go

@@ -1,471 +0,0 @@
-// Copyright 2017 The Gitea Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package models
-
-import (
-	"bytes"
-	"container/list"
-	"crypto"
-	"encoding/base64"
-	"fmt"
-	"hash"
-	"io"
-	"strings"
-	"time"
-
-	"code.gitea.io/git"
-	"code.gitea.io/gitea/modules/log"
-
-	"github.com/go-xorm/xorm"
-	"golang.org/x/crypto/openpgp"
-	"golang.org/x/crypto/openpgp/armor"
-	"golang.org/x/crypto/openpgp/packet"
-)
-
-// GPGKey represents a GPG key.
-type GPGKey struct {
-	ID                int64     `xorm:"pk autoincr"`
-	OwnerID           int64     `xorm:"INDEX NOT NULL"`
-	KeyID             string    `xorm:"INDEX CHAR(16) NOT NULL"`
-	PrimaryKeyID      string    `xorm:"CHAR(16)"`
-	Content           string    `xorm:"TEXT NOT NULL"`
-	Created           time.Time `xorm:"-"`
-	CreatedUnix       int64
-	Expired           time.Time `xorm:"-"`
-	ExpiredUnix       int64
-	Added             time.Time `xorm:"-"`
-	AddedUnix         int64
-	SubsKey           []*GPGKey `xorm:"-"`
-	Emails            []*EmailAddress
-	CanSign           bool
-	CanEncryptComms   bool
-	CanEncryptStorage bool
-	CanCertify        bool
-}
-
-// BeforeInsert will be invoked by XORM before inserting a record
-func (key *GPGKey) BeforeInsert() {
-	key.AddedUnix = time.Now().Unix()
-	key.ExpiredUnix = key.Expired.Unix()
-	key.CreatedUnix = key.Created.Unix()
-}
-
-// AfterSet is invoked from XORM after setting the value of a field of this object.
-func (key *GPGKey) AfterSet(colName string, _ xorm.Cell) {
-	switch colName {
-	case "key_id":
-		x.Where("primary_key_id=?", key.KeyID).Find(&key.SubsKey)
-	case "added_unix":
-		key.Added = time.Unix(key.AddedUnix, 0).Local()
-	case "expired_unix":
-		key.Expired = time.Unix(key.ExpiredUnix, 0).Local()
-	case "created_unix":
-		key.Created = time.Unix(key.CreatedUnix, 0).Local()
-	}
-}
-
-// ListGPGKeys returns a list of public keys belongs to given user.
-func ListGPGKeys(uid int64) ([]*GPGKey, error) {
-	keys := make([]*GPGKey, 0, 5)
-	return keys, x.Where("owner_id=? AND primary_key_id=''", uid).Find(&keys)
-}
-
-// GetGPGKeyByID returns public key by given ID.
-func GetGPGKeyByID(keyID int64) (*GPGKey, error) {
-	key := new(GPGKey)
-	has, err := x.Id(keyID).Get(key)
-	if err != nil {
-		return nil, err
-	} else if !has {
-		return nil, ErrGPGKeyNotExist{keyID}
-	}
-	return key, nil
-}
-
-// checkArmoredGPGKeyString checks if the given key string is a valid GPG armored key.
-// The function returns the actual public key on success
-func checkArmoredGPGKeyString(content string) (*openpgp.Entity, error) {
-	list, err := openpgp.ReadArmoredKeyRing(strings.NewReader(content))
-	if err != nil {
-		return nil, ErrGPGKeyParsing{err}
-	}
-	return list[0], nil
-}
-
-//addGPGKey add key and subkeys to database
-func addGPGKey(e Engine, key *GPGKey) (err error) {
-	// Save GPG primary key.
-	if _, err = e.Insert(key); err != nil {
-		return err
-	}
-	// Save GPG subs key.
-	for _, subkey := range key.SubsKey {
-		if err := addGPGKey(e, subkey); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// AddGPGKey adds new public key to database.
-func AddGPGKey(ownerID int64, content string) (*GPGKey, error) {
-	ekey, err := checkArmoredGPGKeyString(content)
-	if err != nil {
-		return nil, err
-	}
-
-	// Key ID cannot be duplicated.
-	has, err := x.Where("key_id=?", ekey.PrimaryKey.KeyIdString()).
-		Get(new(GPGKey))
-	if err != nil {
-		return nil, err
-	} else if has {
-		return nil, ErrGPGKeyIDAlreadyUsed{ekey.PrimaryKey.KeyIdString()}
-	}
-
-	//Get DB session
-	sess := x.NewSession()
-	defer sessionRelease(sess)
-	if err = sess.Begin(); err != nil {
-		return nil, err
-	}
-
-	key, err := parseGPGKey(ownerID, ekey)
-	if err != nil {
-		return nil, err
-	}
-
-	if err = addGPGKey(sess, key); err != nil {
-		return nil, err
-	}
-
-	return key, sess.Commit()
-}
-
-//base64EncPubKey encode public kay content to base 64
-func base64EncPubKey(pubkey *packet.PublicKey) (string, error) {
-	var w bytes.Buffer
-	err := pubkey.Serialize(&w)
-	if err != nil {
-		return "", err
-	}
-	return base64.StdEncoding.EncodeToString(w.Bytes()), nil
-}
-
-//parseSubGPGKey parse a sub Key
-func parseSubGPGKey(ownerID int64, primaryID string, pubkey *packet.PublicKey, expiry time.Time) (*GPGKey, error) {
-	content, err := base64EncPubKey(pubkey)
-	if err != nil {
-		return nil, err
-	}
-	return &GPGKey{
-		OwnerID:           ownerID,
-		KeyID:             pubkey.KeyIdString(),
-		PrimaryKeyID:      primaryID,
-		Content:           content,
-		Created:           pubkey.CreationTime,
-		Expired:           expiry,
-		CanSign:           pubkey.CanSign(),
-		CanEncryptComms:   pubkey.PubKeyAlgo.CanEncrypt(),
-		CanEncryptStorage: pubkey.PubKeyAlgo.CanEncrypt(),
-		CanCertify:        pubkey.PubKeyAlgo.CanSign(),
-	}, nil
-}
-
-//parseGPGKey parse a PrimaryKey entity (primary key + subs keys + self-signature)
-func parseGPGKey(ownerID int64, e *openpgp.Entity) (*GPGKey, error) {
-	pubkey := e.PrimaryKey
-
-	//Extract self-sign for expire date based on : https://github.com/golang/crypto/blob/master/openpgp/keys.go#L165
-	var selfSig *packet.Signature
-	for _, ident := range e.Identities {
-		if selfSig == nil {
-			selfSig = ident.SelfSignature
-		} else if ident.SelfSignature.IsPrimaryId != nil && *ident.SelfSignature.IsPrimaryId {
-			selfSig = ident.SelfSignature
-			break
-		}
-	}
-	expiry := time.Time{}
-	if selfSig.KeyLifetimeSecs != nil {
-		expiry = selfSig.CreationTime.Add(time.Duration(*selfSig.KeyLifetimeSecs) * time.Second)
-	}
-
-	//Parse Subkeys
-	subkeys := make([]*GPGKey, len(e.Subkeys))
-	for i, k := range e.Subkeys {
-		subs, err := parseSubGPGKey(ownerID, pubkey.KeyIdString(), k.PublicKey, expiry)
-		if err != nil {
-			return nil, err
-		}
-		subkeys[i] = subs
-	}
-
-	//Check emails
-	userEmails, err := GetEmailAddresses(ownerID)
-	if err != nil {
-		return nil, err
-	}
-	emails := make([]*EmailAddress, len(e.Identities))
-	n := 0
-	for _, ident := range e.Identities {
-
-		for _, e := range userEmails {
-			if e.Email == ident.UserId.Email && e.IsActivated {
-				emails[n] = e
-				break
-			}
-		}
-		if emails[n] == nil {
-			return nil, ErrGPGEmailNotFound{ident.UserId.Email}
-		}
-		n++
-	}
-	content, err := base64EncPubKey(pubkey)
-	if err != nil {
-		return nil, err
-	}
-	return &GPGKey{
-		OwnerID:           ownerID,
-		KeyID:             pubkey.KeyIdString(),
-		PrimaryKeyID:      "",
-		Content:           content,
-		Created:           pubkey.CreationTime,
-		Expired:           expiry,
-		Emails:            emails,
-		SubsKey:           subkeys,
-		CanSign:           pubkey.CanSign(),
-		CanEncryptComms:   pubkey.PubKeyAlgo.CanEncrypt(),
-		CanEncryptStorage: pubkey.PubKeyAlgo.CanEncrypt(),
-		CanCertify:        pubkey.PubKeyAlgo.CanSign(),
-	}, nil
-}
-
-// deleteGPGKey does the actual key deletion
-func deleteGPGKey(e *xorm.Session, keyID string) (int64, error) {
-	if keyID == "" {
-		return 0, fmt.Errorf("empty KeyId forbidden") //Should never happen but just to be sure
-	}
-	return e.Where("key_id=?", keyID).Or("primary_key_id=?", keyID).Delete(new(GPGKey))
-}
-
-// DeleteGPGKey deletes GPG key information in database.
-func DeleteGPGKey(doer *User, id int64) (err error) {
-	key, err := GetGPGKeyByID(id)
-	if err != nil {
-		if IsErrGPGKeyNotExist(err) {
-			return nil
-		}
-		return fmt.Errorf("GetPublicKeyByID: %v", err)
-	}
-
-	// Check if user has access to delete this key.
-	if !doer.IsAdmin && doer.ID != key.OwnerID {
-		return ErrGPGKeyAccessDenied{doer.ID, key.ID}
-	}
-
-	sess := x.NewSession()
-	defer sessionRelease(sess)
-	if err = sess.Begin(); err != nil {
-		return err
-	}
-
-	if _, err = deleteGPGKey(sess, key.KeyID); err != nil {
-		return err
-	}
-
-	if err = sess.Commit(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// CommitVerification represents a commit validation of signature
-type CommitVerification struct {
-	Verified    bool
-	Reason      string
-	SigningUser *User
-	SigningKey  *GPGKey
-}
-
-// SignCommit represents a commit with validation of signature.
-type SignCommit struct {
-	Verification *CommitVerification
-	*UserCommit
-}
-
-func readerFromBase64(s string) (io.Reader, error) {
-	bs, err := base64.StdEncoding.DecodeString(s)
-	if err != nil {
-		return nil, err
-	}
-	return bytes.NewBuffer(bs), nil
-}
-
-func populateHash(hashFunc crypto.Hash, msg []byte) (hash.Hash, error) {
-	h := hashFunc.New()
-	if _, err := h.Write(msg); err != nil {
-		return nil, err
-	}
-	return h, nil
-}
-
-// readArmoredSign read an armored signature block with the given type. https://sourcegraph.com/github.com/golang/crypto/-/blob/openpgp/read.go#L24:6-24:17
-func readArmoredSign(r io.Reader) (body io.Reader, err error) {
-	block, err := armor.Decode(r)
-	if err != nil {
-		return
-	}
-	if block.Type != openpgp.SignatureType {
-		return nil, fmt.Errorf("expected '" + openpgp.SignatureType + "', got: " + block.Type)
-	}
-	return block.Body, nil
-}
-
-func extractSignature(s string) (*packet.Signature, error) {
-	r, err := readArmoredSign(strings.NewReader(s))
-	if err != nil {
-		return nil, fmt.Errorf("Failed to read signature armor")
-	}
-	p, err := packet.Read(r)
-	if err != nil {
-		return nil, fmt.Errorf("Failed to read signature packet")
-	}
-	sig, ok := p.(*packet.Signature)
-	if !ok {
-		return nil, fmt.Errorf("Packet is not a signature")
-	}
-	return sig, nil
-}
-
-func verifySign(s *packet.Signature, h hash.Hash, k *GPGKey) error {
-	//Check if key can sign
-	if !k.CanSign {
-		return fmt.Errorf("key can not sign")
-	}
-	//Decode key
-	b, err := readerFromBase64(k.Content)
-	if err != nil {
-		return err
-	}
-	//Read key
-	p, err := packet.Read(b)
-	if err != nil {
-		return err
-	}
-
-	//Check type
-	pkey, ok := p.(*packet.PublicKey)
-	if !ok {
-		return fmt.Errorf("key is not a public key")
-	}
-
-	return pkey.VerifySignature(h, s)
-}
-
-// ParseCommitWithSignature check if signature is good against keystore.
-func ParseCommitWithSignature(c *git.Commit) *CommitVerification {
-
-	if c.Signature != nil {
-
-		//Parsing signature
-		sig, err := extractSignature(c.Signature.Signature)
-		if err != nil { //Skipping failed to extract sign
-			log.Error(3, "SignatureRead err: %v", err)
-			return &CommitVerification{
-				Verified: false,
-				Reason:   "gpg.error.extract_sign",
-			}
-		}
-
-		//Find Committer account
-		committer, err := GetUserByEmail(c.Committer.Email)
-		if err != nil { //Skipping not user for commiter
-			log.Error(3, "NoCommitterAccount: %v", err)
-			return &CommitVerification{
-				Verified: false,
-				Reason:   "gpg.error.no_committer_account",
-			}
-		}
-
-		keys, err := ListGPGKeys(committer.ID)
-		if err != nil || len(keys) == 0 { //Skipping failed to get gpg keys of user
-			log.Error(3, "ListGPGKeys: %v", err)
-			return &CommitVerification{
-				Verified: false,
-				Reason:   "gpg.error.failed_retrieval_gpg_keys",
-			}
-		}
-
-		for _, k := range keys {
-			//Generating hash of commit
-			hash, err := populateHash(sig.Hash, []byte(c.Signature.Payload))
-			if err != nil { //Skipping ailed to generate hash
-				log.Error(3, "PopulateHash: %v", err)
-				return &CommitVerification{
-					Verified: false,
-					Reason:   "gpg.error.generate_hash",
-				}
-			}
-			//We get PK
-			if err := verifySign(sig, hash, k); err == nil {
-				return &CommitVerification{ //Everything is ok
-					Verified:    true,
-					Reason:      fmt.Sprintf("%s <%s> / %s", c.Committer.Name, c.Committer.Email, k.KeyID),
-					SigningUser: committer,
-					SigningKey:  k,
-				}
-			}
-			//And test also SubsKey
-			for _, sk := range k.SubsKey {
-
-				//Generating hash of commit
-				hash, err := populateHash(sig.Hash, []byte(c.Signature.Payload))
-				if err != nil { //Skipping ailed to generate hash
-					log.Error(3, "PopulateHash: %v", err)
-					return &CommitVerification{
-						Verified: false,
-						Reason:   "gpg.error.generate_hash",
-					}
-				}
-				if err := verifySign(sig, hash, sk); err == nil {
-					return &CommitVerification{ //Everything is ok
-						Verified:    true,
-						Reason:      fmt.Sprintf("%s <%s> / %s", c.Committer.Name, c.Committer.Email, sk.KeyID),
-						SigningUser: committer,
-						SigningKey:  sk,
-					}
-				}
-			}
-		}
-		return &CommitVerification{ //Default at this stage
-			Verified: false,
-			Reason:   "gpg.error.no_gpg_keys_found",
-		}
-	}
-
-	return &CommitVerification{
-		Verified: false,                         //Default value
-		Reason:   "gpg.error.not_signed_commit", //Default value
-	}
-}
-
-// ParseCommitsWithSignature checks if signaute of commits are corresponding to users gpg keys.
-func ParseCommitsWithSignature(oldCommits *list.List) *list.List {
-	var (
-		newCommits = list.New()
-		e          = oldCommits.Front()
-	)
-	for e != nil {
-		c := e.Value.(UserCommit)
-		newCommits.PushBack(SignCommit{
-			UserCommit:   &c,
-			Verification: ParseCommitWithSignature(c.Commit),
-		})
-		e = e.Next()
-	}
-	return newCommits
-}

models/gpg_key_test.go

@@ -1,164 +0,0 @@
-// Copyright 2017 The Gitea Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package models
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestCheckArmoredGPGKeyString(t *testing.T) {
-	testGPGArmor := `-----BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFh91QoBCADciaDd7aqegYkn4ZIG7J0p1CRwpqMGjxFroJEMg6M1ZiuEVTRv
-z49P4kcr1+98NvFmcNc+x5uJgvPCwr/N8ZW5nqBUs2yrklbFF4MeQomyZJJegP8m
-/dsRT3BwIT8YMUtJuCj0iqD9vuKYfjrztcMgC1sYwcE9E9OlA0pWBvUdU2i0TIB1
-vOq6slWGvHHa5l5gPfm09idlVxfH5+I+L1uIMx5ovbiVVU5x2f1AR1T18f0t2TVN
-0agFTyuoYE1ATmvJHmMcsfgM1Gpd9hIlr9vlupT2kKTPoNzVzsJsOU6Ku/Lf/bac
-mF+TfSbRCtmG7dkYZ4metLj7zG/WkW8IvJARABEBAAG0HUFudG9pbmUgR0lSQVJE
-IDxzYXBrQHNhcGsuZnI+iQFUBBMBCAA+FiEEEIOwJg/1vpF1itJ4roJVuKDYKOQF
-Alh91QoCGwMFCQPCZwAFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQroJVuKDY
-KORreggAlIkC2QjHP5tb7b0+LksB2JMXdY+UzZBcJxtNmvA7gNQaGvWRrhrbePpa
-MKDP+3A4BPDBsWFbbB7N56vQ5tROpmWbNKuFOVER4S1bj0JZV0E+xkDLqt9QwQtQ
-ojd7oIZJwDUwdud1PvCza2mjgBqqiFE+twbc3i9xjciCGspMniUul1eQYLxRJ0w+
-sbvSOUnujnq5ByMSz9ij00O6aiPfNQS5oB5AALfpjYZDvWAAljLVrtmlQJWZ6dZo
-T/YNwsW2dECPuti8+Nmu5FxPGDTXxdbnRaeJTQ3T6q1oUVAv7yTXBx5NXfXkMa5i
-iEayQIH8Joq5Ev5ja/lRGQQhArMQ2bkBDQRYfdUKAQgAv7B3coLSrOQbuTZSlgWE
-QeT+7DWbmqE1LAQA1pQPcUPXLBUVd60amZJxF9nzUYcY83ylDi0gUNJS+DJGOXpT
-pzX2IOuOMGbtUSeKwg5s9O4SUO7f2yCc3RGaegER5zgESxelmOXG+b/hoNt7JbdU
-JtxcnLr91Jw2PBO/Xf0ZKJ01CQG2Yzdrrj6jnrHyx94seHy0i6xH1o0OuvfVMLfN
-/Vbb/ZHh6ym2wHNqRX62b0VAbchcJXX/MEehXGknKTkO6dDUd+mhRgWMf9ZGRFWx
-ag4qALimkf1FXtAyD0vxFYeyoWUQzrOvUsm2BxIN/986R08fhkBQnp5nz07mrU02
-cQARAQABiQE8BBgBCAAmFiEEEIOwJg/1vpF1itJ4roJVuKDYKOQFAlh91QoCGwwF
-CQPCZwAACgkQroJVuKDYKOT32wf/UZqMdPn5OhyhffFzjQx7wolrf92WkF2JkxtH
-6c3Htjlt/p5RhtKEeErSrNAxB4pqB7dznHaJXiOdWEZtRVXXjlNHjrokGTesqtKk
-lHWtK62/MuyLdr+FdCl68F3ewuT2iu/MDv+D4HPqA47zma9xVgZ9ZNwJOpv3fCOo
-RfY66UjGEnfgYifgtI5S84/mp2jaSc9UNvlZB6RSf8cfbJUL74kS2lq+xzSlf0yP
-Av844q/BfRuVsJsK1NDNG09LC30B0l3LKBqlrRmRTUMHtgchdX2dY+p7GPOoSzlR
-MkM/fdpyc2hY7Dl/+qFmN5MG5yGmMpQcX+RNNR222ibNC1D3wg==
-=i9b7
------END PGP PUBLIC KEY BLOCK-----`
-
-	key, err := checkArmoredGPGKeyString(testGPGArmor)
-	assert.Nil(t, err, "Could not parse a valid GPG armored key", key)
-	//TODO verify value of key
-}
-
-func TestExtractSignature(t *testing.T) {
-	testGPGArmor := `-----BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFh91QoBCADciaDd7aqegYkn4ZIG7J0p1CRwpqMGjxFroJEMg6M1ZiuEVTRv
-z49P4kcr1+98NvFmcNc+x5uJgvPCwr/N8ZW5nqBUs2yrklbFF4MeQomyZJJegP8m
-/dsRT3BwIT8YMUtJuCj0iqD9vuKYfjrztcMgC1sYwcE9E9OlA0pWBvUdU2i0TIB1
-vOq6slWGvHHa5l5gPfm09idlVxfH5+I+L1uIMx5ovbiVVU5x2f1AR1T18f0t2TVN
-0agFTyuoYE1ATmvJHmMcsfgM1Gpd9hIlr9vlupT2kKTPoNzVzsJsOU6Ku/Lf/bac
-mF+TfSbRCtmG7dkYZ4metLj7zG/WkW8IvJARABEBAAG0HUFudG9pbmUgR0lSQVJE
-IDxzYXBrQHNhcGsuZnI+iQFUBBMBCAA+FiEEEIOwJg/1vpF1itJ4roJVuKDYKOQF
-Alh91QoCGwMFCQPCZwAFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQroJVuKDY
-KORreggAlIkC2QjHP5tb7b0+LksB2JMXdY+UzZBcJxtNmvA7gNQaGvWRrhrbePpa
-MKDP+3A4BPDBsWFbbB7N56vQ5tROpmWbNKuFOVER4S1bj0JZV0E+xkDLqt9QwQtQ
-ojd7oIZJwDUwdud1PvCza2mjgBqqiFE+twbc3i9xjciCGspMniUul1eQYLxRJ0w+
-sbvSOUnujnq5ByMSz9ij00O6aiPfNQS5oB5AALfpjYZDvWAAljLVrtmlQJWZ6dZo
-T/YNwsW2dECPuti8+Nmu5FxPGDTXxdbnRaeJTQ3T6q1oUVAv7yTXBx5NXfXkMa5i
-iEayQIH8Joq5Ev5ja/lRGQQhArMQ2bkBDQRYfdUKAQgAv7B3coLSrOQbuTZSlgWE
-QeT+7DWbmqE1LAQA1pQPcUPXLBUVd60amZJxF9nzUYcY83ylDi0gUNJS+DJGOXpT
-pzX2IOuOMGbtUSeKwg5s9O4SUO7f2yCc3RGaegER5zgESxelmOXG+b/hoNt7JbdU
-JtxcnLr91Jw2PBO/Xf0ZKJ01CQG2Yzdrrj6jnrHyx94seHy0i6xH1o0OuvfVMLfN
-/Vbb/ZHh6ym2wHNqRX62b0VAbchcJXX/MEehXGknKTkO6dDUd+mhRgWMf9ZGRFWx
-ag4qALimkf1FXtAyD0vxFYeyoWUQzrOvUsm2BxIN/986R08fhkBQnp5nz07mrU02
-cQARAQABiQE8BBgBCAAmFiEEEIOwJg/1vpF1itJ4roJVuKDYKOQFAlh91QoCGwwF
-CQPCZwAACgkQroJVuKDYKOT32wf/UZqMdPn5OhyhffFzjQx7wolrf92WkF2JkxtH
-6c3Htjlt/p5RhtKEeErSrNAxB4pqB7dznHaJXiOdWEZtRVXXjlNHjrokGTesqtKk
-lHWtK62/MuyLdr+FdCl68F3ewuT2iu/MDv+D4HPqA47zma9xVgZ9ZNwJOpv3fCOo
-RfY66UjGEnfgYifgtI5S84/mp2jaSc9UNvlZB6RSf8cfbJUL74kS2lq+xzSlf0yP
-Av844q/BfRuVsJsK1NDNG09LC30B0l3LKBqlrRmRTUMHtgchdX2dY+p7GPOoSzlR
-MkM/fdpyc2hY7Dl/+qFmN5MG5yGmMpQcX+RNNR222ibNC1D3wg==
-=i9b7
------END PGP PUBLIC KEY BLOCK-----`
-	ekey, err := checkArmoredGPGKeyString(testGPGArmor)
-	assert.Nil(t, err, "Could not parse a valid GPG armored key", ekey)
-
-	pubkey := ekey.PrimaryKey
-	content, err := base64EncPubKey(pubkey)
-	assert.Nil(t, err, "Could not base64 encode a valid PublicKey content", ekey)
-
-	key := &GPGKey{
-		KeyID:             pubkey.KeyIdString(),
-		Content:           content,
-		Created:           pubkey.CreationTime,
-		CanSign:           pubkey.CanSign(),
-		CanEncryptComms:   pubkey.PubKeyAlgo.CanEncrypt(),
-		CanEncryptStorage: pubkey.PubKeyAlgo.CanEncrypt(),
-		CanCertify:        pubkey.PubKeyAlgo.CanSign(),
-	}
-
-	cannotsignkey := &GPGKey{
-		KeyID:             pubkey.KeyIdString(),
-		Content:           content,
-		Created:           pubkey.CreationTime,
-		CanSign:           false,
-		CanEncryptComms:   false,
-		CanEncryptStorage: false,
-		CanCertify:        false,
-	}
-
-	testGoodSigArmor := `-----BEGIN PGP SIGNATURE-----
-
-iQEzBAABCAAdFiEEEIOwJg/1vpF1itJ4roJVuKDYKOQFAljAiQIACgkQroJVuKDY
-KORvCgf6A/Ehh0r7QbO2tFEghT+/Ab+bN7jRN3zP9ed6/q/ophYmkrU0NibtbJH9
-AwFVdHxCmj78SdiRjaTKyevklXw34nvMftmvnOI4lBNUdw6KWl25/n/7wN0l2oZW
-rW3UawYpZgodXiLTYarfEimkDQmT67ArScjRA6lLbkEYKO0VdwDu+Z6yBUH3GWtm
-45RkXpnsF6AXUfuD7YxnfyyDE1A7g7zj4vVYUAfWukJjqow/LsCUgETETJOqj9q3
-52/oQDs04fVkIEtCDulcY+K/fKlukBPJf9WceNDEqiENUzN/Z1y0E+tJ07cSy4bk
-yIJb+d0OAaG8bxloO7nJq4Res1Qa8Q==
-=puvG
------END PGP SIGNATURE-----`
-	testGoodPayload := `tree 56ae8d2799882b20381fc11659db06c16c68c61a
-parent c7870c39e4e6b247235ca005797703ec4254613f
-author Antoine GIRARD <sapk@sapk.fr> 1489012989 +0100
-committer Antoine GIRARD <sapk@sapk.fr> 1489012989 +0100
-
-Goog GPG
-`
-
-	testBadSigArmor := `-----BEGIN PGP SIGNATURE-----
-
-iQEzBAABCAAdFiEE5yr4rn9ulbdMxJFiPYI/ySNrtNkFAljAiYkACgkQPYI/ySNr
-tNmDdQf+NXhVRiOGt0GucpjJCGrOnK/qqVUmQyRUfrqzVUdb/1/Ws84V5/wE547I
-6z3oxeBKFsJa1CtIlxYaUyVhYnDzQtphJzub+Aw3UG0E2ywiE+N7RCa1Ufl7pPxJ
-U0SD6gvNaeTDQV/Wctu8v8DkCtEd3N8cMCDWhvy/FQEDztVtzm8hMe0Vdm0ozEH6
-P0W93sDNkLC5/qpWDN44sFlYDstW5VhMrnF0r/ohfaK2kpYHhkPk7WtOoHSUwQSg
-c4gfhjvXIQrWFnII1Kr5jFGlmgNSR02qpb31VGkMzSnBhWVf2OaHS/kI49QHJakq
-AhVDEnoYLCgoDGg9c3p1Ll2452/c6Q==
-=uoGV
------END PGP SIGNATURE-----`
-	testBadPayload := `tree 3074ff04951956a974e8b02d57733b0766f7cf6c
-parent fd3577542f7ad1554c7c7c0eb86bb57a1324ad91
-author Antoine GIRARD <sapk@sapk.fr> 1489013107 +0100
-committer Antoine GIRARD <sapk@sapk.fr> 1489013107 +0100
-
-Unkonwn GPG key with good email
-`
-	//Reading Sign
-	goodSig, err := extractSignature(testGoodSigArmor)
-	assert.Nil(t, err, "Could not parse a valid GPG armored signature", testGoodSigArmor)
-	badSig, err := extractSignature(testBadSigArmor)
-	assert.Nil(t, err, "Could not parse a valid GPG armored signature", testBadSigArmor)
-
-	//Generating hash of commit
-	goodHash, err := populateHash(goodSig.Hash, []byte(testGoodPayload))
-	assert.Nil(t, err, "Could not generate a valid hash of payload", testGoodPayload)
-	badHash, err := populateHash(badSig.Hash, []byte(testBadPayload))
-	assert.Nil(t, err, "Could not generate a valid hash of payload", testBadPayload)
-
-	//Verify
-	err = verifySign(goodSig, goodHash, key)
-	assert.Nil(t, err, "Could not validate a good signature")
-	err = verifySign(badSig, badHash, key)
-	assert.NotNil(t, err, "Validate a bad signature")
-	err = verifySign(goodSig, goodHash, cannotsignkey)
-	assert.NotNil(t, err, "Validate a bad signature with a kay that can not sign")
-}

models/issue.go

@@ -146,7 +146,7 @@ func (issue *Issue) loadAttributes(e Engine) (err error) {
 
 	if issue.Milestone == nil && issue.MilestoneID > 0 {
 		issue.Milestone, err = getMilestoneByRepoID(e, issue.RepoID, issue.MilestoneID)
-		if err != nil {
+		if err != nil && !IsErrMilestoneNotExist(err) {
 			return fmt.Errorf("getMilestoneByRepoID [repo_id: %d, milestone_id: %d]: %v", issue.RepoID, issue.MilestoneID, err)
 		}
 	}
@@ -374,7 +374,7 @@ func (issue *Issue) RemoveLabel(doer *User, label *Label) error {
 		return err
 	}
 
-	if has, err := HasAccess(doer.ID, issue.Repo, AccessModeWrite); err != nil {
+	if has, err := HasAccess(doer, issue.Repo, AccessModeWrite); err != nil {
 		return err
 	} else if !has {
 		return ErrLabelNotExist{}
@@ -415,7 +415,7 @@ func (issue *Issue) ClearLabels(doer *User) (err error) {
 		return err
 	}
 
-	if has, err := hasAccess(sess, doer.ID, issue.Repo, AccessModeWrite); err != nil {
+	if has, err := hasAccess(sess, doer, issue.Repo, AccessModeWrite); err != nil {
 		return err
 	} else if !has {
 		return ErrLabelNotExist{}
@@ -733,7 +733,7 @@ func (issue *Issue) ChangeContent(doer *User, content string) (err error) {
 	return nil
 }
 
-// ChangeAssignee changes the Assignee field of this issue.
+// ChangeAssignee changes the Asssignee field of this issue.
 func (issue *Issue) ChangeAssignee(doer *User, assigneeID int64) (err error) {
 	var oldAssigneeID = issue.AssigneeID
 	issue.AssigneeID = assigneeID
@@ -809,14 +809,23 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) {
 		}
 	}
 
-	if assigneeID := opts.Issue.AssigneeID; assigneeID > 0 {
-		valid, err := hasAccess(e, assigneeID, opts.Repo, AccessModeWrite)
-		if err != nil {
-			return fmt.Errorf("hasAccess [user_id: %d, repo_id: %d]: %v", assigneeID, opts.Repo.ID, err)
+	if opts.Issue.AssigneeID > 0 {
+		assignee, err := getUserByID(e, opts.Issue.AssigneeID)
+		if err != nil && !IsErrUserNotExist(err) {
+			return fmt.Errorf("getUserByID: %v", err)
 		}
-		if !valid {
-			opts.Issue.AssigneeID = 0
-			opts.Issue.Assignee = nil
+
+		// Assume assignee is invalid and drop silently.
+		opts.Issue.AssigneeID = 0
+		if assignee != nil {
+			valid, err := hasAccess(e, assignee, opts.Repo, AccessModeWrite)
+			if err != nil {
+				return fmt.Errorf("hasAccess [user_id: %d, repo_id: %d]: %v", assignee.ID, opts.Repo.ID, err)
+			}
+			if valid {
+				opts.Issue.AssigneeID = assignee.ID
+				opts.Issue.Assignee = assignee
+			}
 		}
 	}
 
@@ -1002,16 +1011,6 @@ func GetIssueByID(id int64) (*Issue, error) {
 	return getIssueByID(x, id)
 }
 
-func getIssuesByIDs(e Engine, issueIDs []int64) ([]*Issue, error) {
-	issues := make([]*Issue, 0, 10)
-	return issues, e.In("id", issueIDs).Find(&issues)
-}
-
-// GetIssuesByIDs return issues with the given IDs.
-func GetIssuesByIDs(issueIDs []int64) ([]*Issue, error) {
-	return getIssuesByIDs(x, issueIDs)
-}
-
 // IssuesOptions represents options of an issue.
 type IssuesOptions struct {
 	RepoID      int64
@@ -1134,24 +1133,6 @@ func Issues(opts *IssuesOptions) ([]*Issue, error) {
 	return issues, nil
 }
 
-// GetParticipantsByIssueID returns all users who are participated in comments of an issue.
-func GetParticipantsByIssueID(issueID int64) ([]*User, error) {
-	userIDs := make([]int64, 0, 5)
-	if err := x.Table("comment").Cols("poster_id").
-		Where("issue_id = ?", issueID).
-		And("type = ?", CommentTypeComment).
-		Distinct("poster_id").
-		Find(&userIDs); err != nil {
-		return nil, fmt.Errorf("get poster IDs: %v", err)
-	}
-	if len(userIDs) == 0 {
-		return nil, nil
-	}
-
-	users := make([]*User, 0, len(userIDs))
-	return users, x.In("id", userIDs).Find(&users)
-}
-
 // UpdateIssueMentions extracts mentioned people from content and
 // updates issue-user relations for them.
 func UpdateIssueMentions(e Engine, issueID int64, mentions []string) error {

models/issue_comment.go

@@ -231,12 +231,9 @@ func (c *Comment) LoadMilestone() error {
 		has, err := x.ID(c.OldMilestoneID).Get(&oldMilestone)
 		if err != nil {
 			return err
-		} else if !has {
-			return ErrMilestoneNotExist{
-				ID: c.OldMilestoneID,
-			}
+		} else if has {
+			c.OldMilestone = &oldMilestone
 		}
-		c.OldMilestone = &oldMilestone
 	}
 
 	if c.MilestoneID > 0 {
@@ -244,12 +241,9 @@ func (c *Comment) LoadMilestone() error {
 		has, err := x.ID(c.MilestoneID).Get(&milestone)
 		if err != nil {
 			return err
-		} else if !has {
-			return ErrMilestoneNotExist{
-				ID: c.MilestoneID,
-			}
+		} else if has {
+			c.Milestone = &milestone
 		}
-		c.Milestone = &milestone
 	}
 	return nil
 }

models/issue_list.go

@@ -59,10 +59,10 @@ func (issues IssueList) loadPosters(e Engine) error {
 		return nil
 	}
 
-	posterIDs := issues.getPosterIDs()
-	posterMaps := make(map[int64]*User, len(posterIDs))
+	postgerIDs := issues.getPosterIDs()
+	posterMaps := make(map[int64]*User, len(postgerIDs))
 	err := e.
-		In("id", posterIDs).
+		In("id", postgerIDs).
 		Find(&posterMaps)
 	if err != nil {
 		return err

models/issue_list_test.go

@@ -1,65 +0,0 @@
-// Copyright 2017 The Gitea Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package models
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestIssueList_LoadRepositories(t *testing.T) {
-	assert.NoError(t, PrepareTestDatabase())
-
-	issueList := IssueList{
-		AssertExistsAndLoadBean(t, &Issue{ID: 1}).(*Issue),
-		AssertExistsAndLoadBean(t, &Issue{ID: 2}).(*Issue),
-		AssertExistsAndLoadBean(t, &Issue{ID: 4}).(*Issue),
-	}
-
-	repos, err := issueList.LoadRepositories()
-	assert.NoError(t, err)
-	assert.Len(t, repos, 2)
-	for _, issue := range issueList {
-		assert.EqualValues(t, issue.RepoID, issue.Repo.ID)
-	}
-}
-
-func TestIssueList_LoadAttributes(t *testing.T) {
-	assert.NoError(t, PrepareTestDatabase())
-
-	issueList := IssueList{
-		AssertExistsAndLoadBean(t, &Issue{ID: 1}).(*Issue),
-		AssertExistsAndLoadBean(t, &Issue{ID: 2}).(*Issue),
-		AssertExistsAndLoadBean(t, &Issue{ID: 4}).(*Issue),
-	}
-
-	assert.NoError(t, issueList.LoadAttributes())
-	for _, issue := range issueList {
-		assert.EqualValues(t, issue.RepoID, issue.Repo.ID)
-		for _, label := range issue.Labels {
-			assert.EqualValues(t, issue.RepoID, label.RepoID)
-			AssertExistsAndLoadBean(t, &IssueLabel{IssueID: issue.ID, LabelID: label.ID})
-		}
-		if issue.PosterID > 0 {
-			assert.EqualValues(t, issue.PosterID, issue.Poster.ID)
-		}
-		if issue.AssigneeID > 0 {
-			assert.EqualValues(t, issue.AssigneeID, issue.Assignee.ID)
-		}
-		if issue.MilestoneID > 0 {
-			assert.EqualValues(t, issue.MilestoneID, issue.Milestone.ID)
-		}
-		if issue.IsPull {
-			assert.EqualValues(t, issue.ID, issue.PullRequest.IssueID)
-		}
-		for _, attachment := range issue.Attachments {
-			assert.EqualValues(t, issue.ID, attachment.IssueID)
-		}
-		for _, comment := range issue.Comments {
-			assert.EqualValues(t, issue.ID, comment.IssueID)
-		}
-	}
-}

models/issue_mail.go

@@ -19,27 +19,15 @@ func (issue *Issue) mailSubject() string {
 }
 
 // mailIssueCommentToParticipants can be used for both new issue creation and comment.
-// This function sends two list of emails:
-// 1. Repository watchers and users who are participated in comments.
-// 2. Users who are not in 1. but get mentioned in current issue/comment.
 func mailIssueCommentToParticipants(issue *Issue, doer *User, mentions []string) error {
 	if !setting.Service.EnableNotifyMail {
 		return nil
 	}
 
+	// Mail watchers.
 	watchers, err := GetWatchers(issue.RepoID)
 	if err != nil {
-		return fmt.Errorf("GetWatchers [repo_id: %d]: %v", issue.RepoID, err)
-	}
-	participants, err := GetParticipantsByIssueID(issue.ID)
-	if err != nil {
-		return fmt.Errorf("GetParticipantsByIssueID [issue_id: %d]: %v", issue.ID, err)
-	}
-
-	// In case the issue poster is not watching the repository,
-	// even if we have duplicated in watchers, can be safely filtered out.
-	if issue.PosterID != doer.ID {
-		participants = append(participants, issue.Poster)
+		return fmt.Errorf("GetWatchers [%d]: %v", issue.RepoID, err)
 	}
 
 	tos := make([]string, 0, len(watchers)) // List of email addresses.
@@ -60,16 +48,6 @@ func mailIssueCommentToParticipants(issue *Issue, doer *User, mentions []string)
 		tos = append(tos, to.Email)
 		names = append(names, to.Name)
 	}
-	for i := range participants {
-		if participants[i].ID == doer.ID {
-			continue
-		} else if com.IsSliceContainsStr(names, participants[i].Name) {
-			continue
-		}
-
-		tos = append(tos, participants[i].Email)
-		names = append(names, participants[i].Name)
-	}
 	SendIssueCommentMail(issue, doer, tos)
 
 	// Mail mentioned people and exclude watchers.

models/issue_test.go

@@ -5,7 +5,6 @@
 package models
 
 import (
-	"sort"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -43,44 +42,3 @@ func TestIssueAPIURL(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, "https://try.gitea.io/api/v1/repos/user2/repo1/issues/1", issue.APIURL())
 }
-
-func TestGetIssuesByIDs(t *testing.T) {
-	assert.NoError(t, PrepareTestDatabase())
-	testSuccess := func(expectedIssueIDs []int64, nonExistentIssueIDs []int64) {
-		issues, err := GetIssuesByIDs(append(expectedIssueIDs, nonExistentIssueIDs...))
-		assert.NoError(t, err)
-		actualIssueIDs := make([]int64, len(issues))
-		for i, issue := range issues {
-			actualIssueIDs[i] = issue.ID
-		}
-		assert.Equal(t, expectedIssueIDs, actualIssueIDs)
-
-	}
-	testSuccess([]int64{1, 2, 3}, []int64{})
-	testSuccess([]int64{1, 2, 3}, []int64{NonexistentID})
-}
-
-func TestGetParticipantsByIssueID(t *testing.T) {
-
-	assert.NoError(t, PrepareTestDatabase())
-
-	checkPartecipants := func(issueID int64, userIDs []int) {
-		partecipants, err := GetParticipantsByIssueID(issueID)
-		if assert.NoError(t, err) {
-			partecipantsIDs := make([]int, len(partecipants))
-			for i, u := range partecipants {
-				partecipantsIDs[i] = int(u.ID)
-			}
-			sort.Ints(partecipantsIDs)
-			sort.Ints(userIDs)
-			assert.Equal(t, userIDs, partecipantsIDs)
-		}
-
-	}
-
-	// User 1 is issue1 poster (see fixtures/issue.yml)
-	// User 2 only labeled issue1 (see fixtures/comment.yml)
-	// Users 3 and 5 made actual comments (see fixtures/comment.yml)
-	checkPartecipants(1, []int{3, 5})
-
-}

models/issue_watch.go

@@ -1,96 +0,0 @@
-// Copyright 2017 The Gitea Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package models
-
-import (
-	"time"
-)
-
-// IssueWatch is connection request for receiving issue notification.
-type IssueWatch struct {
-	ID          int64     `xorm:"pk autoincr"`
-	UserID      int64     `xorm:"UNIQUE(watch) NOT NULL"`
-	IssueID     int64     `xorm:"UNIQUE(watch) NOT NULL"`
-	IsWatching  bool      `xorm:"NOT NULL"`
-	Created     time.Time `xorm:"-"`
-	CreatedUnix int64     `xorm:"NOT NULL"`
-	Updated     time.Time `xorm:"-"`
-	UpdatedUnix int64     `xorm:"NOT NULL"`
-}
-
-// BeforeInsert is invoked from XORM before inserting an object of this type.
-func (iw *IssueWatch) BeforeInsert() {
-	var (
-		t = time.Now()
-		u = t.Unix()
-	)
-	iw.Created = t
-	iw.CreatedUnix = u
-	iw.Updated = t
-	iw.UpdatedUnix = u
-}
-
-// BeforeUpdate is invoked from XORM before updating an object of this type.
-func (iw *IssueWatch) BeforeUpdate() {
-	var (
-		t = time.Now()
-		u = t.Unix()
-	)
-	iw.Updated = t
-	iw.UpdatedUnix = u
-}
-
-// CreateOrUpdateIssueWatch set watching for a user and issue
-func CreateOrUpdateIssueWatch(userID, issueID int64, isWatching bool) error {
-	iw, exists, err := getIssueWatch(x, userID, issueID)
-	if err != nil {
-		return err
-	}
-
-	if !exists {
-		iw = &IssueWatch{
-			UserID:     userID,
-			IssueID:    issueID,
-			IsWatching: isWatching,
-		}
-
-		if _, err := x.Insert(iw); err != nil {
-			return err
-		}
-	} else {
-		iw.IsWatching = isWatching
-
-		if _, err := x.Id(iw.ID).Cols("is_watching", "updated_unix").Update(iw); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// GetIssueWatch returns an issue watch by user and issue
-func GetIssueWatch(userID, issueID int64) (iw *IssueWatch, exists bool, err error) {
-	return getIssueWatch(x, userID, issueID)
-}
-
-func getIssueWatch(e Engine, userID, issueID int64) (iw *IssueWatch, exists bool, err error) {
-	iw = new(IssueWatch)
-	exists, err = e.
-		Where("user_id = ?", userID).
-		And("issue_id = ?", issueID).
-		Get(iw)
-	return
-}
-
-// GetIssueWatchers returns watchers/unwatchers of a given issue
-func GetIssueWatchers(issueID int64) ([]*IssueWatch, error) {
-	return getIssueWatchers(x, issueID)
-}
-
-func getIssueWatchers(e Engine, issueID int64) (watches []*IssueWatch, err error) {
-	err = e.
-		Where("issue_id = ?", issueID).
-		Find(&watches)
-	return
-}

models/issue_watch_test.go

@@ -1,51 +0,0 @@
-// Copyright 2017 The Gitea Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package models
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestCreateOrUpdateIssueWatch(t *testing.T) {
-	assert.NoError(t, PrepareTestDatabase())
-
-	assert.NoError(t, CreateOrUpdateIssueWatch(3, 1, true))
-	iw := AssertExistsAndLoadBean(t, &IssueWatch{UserID: 3, IssueID: 1}).(*IssueWatch)
-	assert.Equal(t, true, iw.IsWatching)
-
-	assert.NoError(t, CreateOrUpdateIssueWatch(1, 1, false))
-	iw = AssertExistsAndLoadBean(t, &IssueWatch{UserID: 1, IssueID: 1}).(*IssueWatch)
-	assert.Equal(t, false, iw.IsWatching)
-}
-
-func TestGetIssueWatch(t *testing.T) {
-	assert.NoError(t, PrepareTestDatabase())
-
-	_, exists, err := GetIssueWatch(1, 1)
-	assert.Equal(t, true, exists)
-	assert.NoError(t, err)
-
-	_, exists, err = GetIssueWatch(2, 2)
-	assert.Equal(t, true, exists)
-	assert.NoError(t, err)
-
-	_, exists, err = GetIssueWatch(3, 1)
-	assert.Equal(t, false, exists)
-	assert.NoError(t, err)
-}
-
-func TestGetIssueWatchers(t *testing.T) {
-	assert.NoError(t, PrepareTestDatabase())
-
-	iws, err := GetIssueWatchers(1)
-	assert.NoError(t, err)
-	assert.Equal(t, 1, len(iws))
-
-	iws, err = GetIssueWatchers(5)
-	assert.NoError(t, err)
-	assert.Equal(t, 0, len(iws))
-}

models/login_source.go

@@ -635,7 +635,12 @@ func UserSignIn(username, password string) (*User, error) {
 			}
 		}
 	} else {
-		user = &User{LowerName: strings.ToLower(strings.TrimSpace(username))}
+		trimmedUsername := strings.TrimSpace(username)
+		if len(trimmedUsername) == 0 {
+			return nil, ErrUserNotExist{0, username, 0}
+		}
+
+		user = &User{LowerName: strings.ToLower(trimmedUsername)}
 	}
 
 	hasUser, err := x.Get(user)

models/migrations/migrations.go

@@ -92,22 +92,8 @@ var migrations = []Migration{
 	NewMigration("use new avatar path name for security reason", useNewNameAvatars),
 	// v21 -> v22
 	NewMigration("rewrite authorized_keys file via new format", useNewPublickeyFormat),
-	// v22 -> v23
+	// v21 -> v22
 	NewMigration("generate and migrate wiki Git hooks", generateAndMigrateWikiGitHooks),
-	// v23 -> v24
-	NewMigration("add user openid table", addUserOpenID),
-	// v24 -> v25
-	NewMigration("change the key_id and primary_key_id type", changeGPGKeysColumns),
-	// v25 -> v26
-	NewMigration("add show field in user openid table", addUserOpenIDShow),
-	// v26 -> v27
-	NewMigration("generate and migrate repo and wiki Git hooks", generateAndMigrateGitHookChains),
-	// v27 -> v28
-	NewMigration("change mirror interval from hours to time.Duration", convertIntervalToDuration),
-	// v28 -> v29
-	NewMigration("add field for repo size", addRepoSize),
-	// v29 -> v30
-	NewMigration("add commit status table", addCommitStatus),
 }
 
 // Migrate database to current version

models/migrations/v14.go

@@ -28,7 +28,7 @@ type UserV14 struct {
 	DiffViewStyle string `xorm:"NOT NULL DEFAULT ''"`
 }
 
-// TableName will be invoked by XORM to customize the table name
+// TableName will be invoked by XORM to customrize the table name
 func (*UserV14) TableName() string {
 	return "user"
 }

models/migrations/v20.go

@@ -34,6 +34,7 @@ func useNewNameAvatars(x *xorm.Engine) error {
 	}
 
 	type User struct {
+		ID              int64 `xorm:"pk autoincr"`
 		Avatar          string
 		UseCustomAvatar bool
 	}

models/migrations/v23.go

@@ -1,25 +0,0 @@
-// Copyright 2017 Gitea. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package migrations
-
-import (
-	"fmt"
-
-	"github.com/go-xorm/xorm"
-)
-
-// UserOpenID is the list of all OpenID identities of a user.
-type UserOpenID struct {
-	ID  int64  `xorm:"pk autoincr"`
-	UID int64  `xorm:"INDEX NOT NULL"`
-	URI string `xorm:"UNIQUE NOT NULL"`
-}
-
-func addUserOpenID(x *xorm.Engine) error {
-	if err := x.Sync2(new(UserOpenID)); err != nil {
-		return fmt.Errorf("Sync2: %v", err)
-	}
-	return nil
-}

models/migrations/v24.go

@@ -1,50 +0,0 @@
-// Copyright 2017 The Gitea Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package migrations
-
-import (
-	"time"
-
-	"github.com/go-xorm/xorm"
-)
-
-func changeGPGKeysColumns(x *xorm.Engine) error {
-	// EmailAddress is the list of all email addresses of a user. Can contain the
-	// primary email address, but is not obligatory.
-	type EmailAddress struct {
-		ID          int64  `xorm:"pk autoincr"`
-		UID         int64  `xorm:"INDEX NOT NULL"`
-		Email       string `xorm:"UNIQUE NOT NULL"`
-		IsActivated bool
-		IsPrimary   bool `xorm:"-"`
-	}
-
-	// GPGKey represents a GPG key.
-	type GPGKey struct {
-		ID                int64     `xorm:"pk autoincr"`
-		OwnerID           int64     `xorm:"INDEX NOT NULL"`
-		KeyID             string    `xorm:"INDEX CHAR(16) NOT NULL"`
-		PrimaryKeyID      string    `xorm:"CHAR(16)"`
-		Content           string    `xorm:"TEXT NOT NULL"`
-		Created           time.Time `xorm:"-"`
-		CreatedUnix       int64
-		Expired           time.Time `xorm:"-"`
-		ExpiredUnix       int64
-		Added             time.Time `xorm:"-"`
-		AddedUnix         int64
-		SubsKey           []*GPGKey `xorm:"-"`
-		Emails            []*EmailAddress
-		CanSign           bool
-		CanEncryptComms   bool
-		CanEncryptStorage bool
-		CanCertify        bool
-	}
-
-	if err := x.DropTables(new(GPGKey)); err != nil {
-		return err
-	}
-
-	return x.Sync(new(GPGKey))
-}

models/migrations/v25.go

@@ -1,18 +0,0 @@
-// Copyright 2017 Gitea. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package migrations
-
-import (
-	"fmt"
-
-	"github.com/go-xorm/xorm"
-)
-
-func addUserOpenIDShow(x *xorm.Engine) error {
-	if err := x.Sync2(new(UserOpenID)); err != nil {
-		return fmt.Errorf("Sync2: %v", err)
-	}
-	return nil
-}

models/migrations/v26.go

@@ -1,87 +0,0 @@
-// Copyright 2017 The Gitea Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package migrations
-
-import (
-	"crypto/md5"
-	"encoding/hex"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"code.gitea.io/gitea/modules/setting"
-
-	"github.com/Unknwon/com"
-	"github.com/go-xorm/xorm"
-)
-
-func generateAndMigrateGitHookChains(x *xorm.Engine) (err error) {
-	type Repository struct {
-		ID      int64
-		OwnerID int64
-		Name    string
-	}
-	type User struct {
-		ID   int64
-		Name string
-	}
-
-	var (
-		hookNames = []string{"pre-receive", "update", "post-receive"}
-		hookTpl   = fmt.Sprintf("#!/usr/bin/env %s\ndata=$(cat)\nexitcodes=\"\"\nhookname=$(basename $0)\nGIT_DIR=${GIT_DIR:-$(dirname $0)}\n\nfor hook in ${GIT_DIR}/hooks/${hookname}.d/*; do\ntest -x \"${hook}\" || continue\necho \"${data}\" | \"${hook}\"\nexitcodes=\"${exitcodes} $?\"\ndone\n\nfor i in ${exitcodes}; do\n[ ${i} -eq 0 ] || exit ${i}\ndone\n", setting.ScriptType)
-	)
-
-	return x.Where("id > 0").Iterate(new(Repository),
-		func(idx int, bean interface{}) error {
-			repo := bean.(*Repository)
-			user := new(User)
-			has, err := x.Where("id = ?", repo.OwnerID).Get(user)
-			if err != nil {
-				return fmt.Errorf("query owner of repository [repo_id: %d, owner_id: %d]: %v", repo.ID, repo.OwnerID, err)
-			} else if !has {
-				return nil
-			}
-
-			repoPaths := []string{
-				filepath.Join(setting.RepoRootPath, strings.ToLower(user.Name), strings.ToLower(repo.Name)) + ".git",
-				filepath.Join(setting.RepoRootPath, strings.ToLower(user.Name), strings.ToLower(repo.Name)) + ".wiki.git",
-			}
-
-			for _, repoPath := range repoPaths {
-				if com.IsExist(repoPath) {
-					hookDir := filepath.Join(repoPath, "hooks")
-
-					for _, hookName := range hookNames {
-						oldHookPath := filepath.Join(hookDir, hookName)
-
-						// compare md5sums of hooks
-						if com.IsExist(oldHookPath) {
-
-							f, err := os.Open(oldHookPath)
-							if err != nil {
-								return fmt.Errorf("cannot open old hook file '%s': %v", oldHookPath, err)
-							}
-							defer f.Close()
-							h := md5.New()
-							if _, err := io.Copy(h, f); err != nil {
-								return fmt.Errorf("cannot read old hook file '%s': %v", oldHookPath, err)
-							}
-							if hex.EncodeToString(h.Sum(nil)) == "6718ef67d0834e0a7908259acd566e3f" {
-								return nil
-							}
-						}
-
-						if err = ioutil.WriteFile(oldHookPath, []byte(hookTpl), 0777); err != nil {
-							return fmt.Errorf("write old hook file '%s': %v", oldHookPath, err)
-						}
-					}
-				}
-			}
-			return nil
-		})
-}

models/migrations/v27.go

@@ -1,56 +0,0 @@
-// Copyright 2017 Gitea. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package migrations
-
-import (
-	"fmt"
-	"time"
-
-	"github.com/go-xorm/xorm"
-)
-
-func convertIntervalToDuration(x *xorm.Engine) (err error) {
-	type Repository struct {
-		ID      int64
-		OwnerID int64
-		Name    string
-	}
-	type Mirror struct {
-		ID          int64       `xorm:"pk autoincr"`
-		RepoID      int64       `xorm:"INDEX"`
-		Repo        *Repository `xorm:"-"`
-		Interval    time.Duration
-		EnablePrune bool `xorm:"NOT NULL DEFAULT true"`
-
-		Updated        time.Time `xorm:"-"`
-		UpdatedUnix    int64     `xorm:"INDEX"`
-		NextUpdate     time.Time `xorm:"-"`
-		NextUpdateUnix int64     `xorm:"INDEX"`
-
-		address string `xorm:"-"`
-	}
-
-	sess := x.NewSession()
-	defer sess.Close()
-
-	if err := sess.Begin(); err != nil {
-		return err
-	}
-
-	var mirrors []Mirror
-	err = sess.Table("mirror").Select("*").Find(&mirrors)
-	if err != nil {
-		return fmt.Errorf("Query repositories: %v", err)
-	}
-	for _, mirror := range mirrors {
-		mirror.Interval = mirror.Interval * time.Hour
-		_, err := sess.Id(mirror.ID).Cols("interval").Update(mirror)
-		if err != nil {
-			return fmt.Errorf("update mirror interval failed: %v", err)
-		}
-	}
-
-	return sess.Commit()
-}

models/migrations/v28.go

@@ -1,77 +0,0 @@
-// Copyright 2017 The Gogs Authors. All rights reserved.
-// Copyright 2017 Gitea. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package migrations
-
-import (
-	"fmt"
-	"path/filepath"
-	"strings"
-
-	"code.gitea.io/git"
-	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/modules/setting"
-
-	"github.com/go-xorm/xorm"
-)
-
-func addRepoSize(x *xorm.Engine) (err error) {
-	log.Info("This migration could take up to minutes, please be patient.")
-	type Repository struct {
-		ID      int64
-		OwnerID int64
-		Name    string
-		Size    int64
-	}
-	type User struct {
-		ID   int64
-		Name string
-	}
-	if err = x.Sync2(new(Repository)); err != nil {
-		return fmt.Errorf("Sync2: %v", err)
-	}
-
-	// For the sake of SQLite3, we can't use x.Iterate here.
-	offset := 0
-	for {
-		repos := make([]*Repository, 0, 10)
-		if err = x.Sql(fmt.Sprintf("SELECT * FROM `repository` ORDER BY id ASC LIMIT 10 OFFSET %d", offset)).
-			Find(&repos); err != nil {
-			return fmt.Errorf("select repos [offset: %d]: %v", offset, err)
-		}
-		log.Trace("Select [offset: %d, repos: %d]", offset, len(repos))
-		if len(repos) == 0 {
-			break
-		}
-		offset += 10
-
-		for _, repo := range repos {
-			if repo.Name == "." || repo.Name == ".." {
-				continue
-			}
-
-			user := new(User)
-			has, err := x.Where("id = ?", repo.OwnerID).Get(user)
-			if err != nil {
-				return fmt.Errorf("query owner of repository [repo_id: %d, owner_id: %d]: %v", repo.ID, repo.OwnerID, err)
-			} else if !has {
-				continue
-			}
-
-			repoPath := filepath.Join(setting.RepoRootPath, strings.ToLower(user.Name), strings.ToLower(repo.Name)) + ".git"
-			countObject, err := git.GetRepoSize(repoPath)
-			if err != nil {
-				log.Warn("GetRepoSize: %v", err)
-				continue
-			}
-
-			repo.Size = countObject.Size + countObject.SizePack
-			if _, err = x.Id(repo.ID).Cols("size").Update(repo); err != nil {
-				return fmt.Errorf("update size: %v", err)
-			}
-		}
-	}
-	return nil
-}

models/migrations/v29.go

@@ -1,34 +0,0 @@
-// Copyright 2017 The Gogs Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package migrations
-
-import (
-	"fmt"
-
-	"github.com/go-xorm/xorm"
-)
-
-// CommitStatus see models/status.go
-type CommitStatus struct {
-	ID          int64  `xorm:"pk autoincr"`
-	Index       int64  `xorm:"INDEX UNIQUE(repo_sha_index)"`
-	RepoID      int64  `xorm:"INDEX UNIQUE(repo_sha_index)"`
-	State       string `xorm:"VARCHAR(7) NOT NULL"`
-	SHA         string `xorm:"VARCHAR(64) NOT NULL INDEX UNIQUE(repo_sha_index)"`
-	TargetURL   string `xorm:"TEXT"`
-	Description string `xorm:"TEXT"`
-	Context     string `xorm:"TEXT"`
-	CreatorID   int64  `xorm:"INDEX"`
-
-	CreatedUnix int64 `xorm:"INDEX"`
-	UpdatedUnix int64 `xorm:"INDEX"`
-}
-
-func addCommitStatus(x *xorm.Engine) error {
-	if err := x.Sync2(new(CommitStatus)); err != nil {
-		return fmt.Errorf("Sync2: %v", err)
-	}
-	return nil
-}

models/models.go

@@ -5,9 +5,7 @@
 package models
 
 import (
-	"bufio"
 	"database/sql"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"net/url"
@@ -15,21 +13,20 @@ import (
 	"path"
 	"strings"
 
-	"code.gitea.io/gitea/models/migrations"
-	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/modules/setting"
-
-	"github.com/Unknwon/com"
-	"github.com/go-xorm/core"
-	"github.com/go-xorm/xorm"
 	// Needed for the MySQL driver
 	_ "github.com/go-sql-driver/mysql"
+	"github.com/go-xorm/core"
+	"github.com/go-xorm/xorm"
 
 	// Needed for the Postgresql driver
 	_ "github.com/lib/pq"
 
 	// Needed for the MSSSQL driver
 	_ "github.com/denisenkom/go-mssqldb"
+
+	"code.gitea.io/gitea/models/migrations"
+	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/setting"
 )
 
 // Engine represents a xorm engine or session.
@@ -114,14 +111,10 @@ func init() {
 		new(IssueUser),
 		new(LFSMetaObject),
 		new(TwoFactor),
-		new(GPGKey),
 		new(RepoUnit),
 		new(RepoRedirect),
 		new(ExternalLoginUser),
 		new(ProtectedBranch),
-		new(UserOpenID),
-		new(IssueWatch),
-		new(CommitStatus),
 	)
 
 	gonicNames := []string{"SSL", "UID"}
@@ -330,104 +323,14 @@ func Ping() error {
 	return x.Ping()
 }
 
-// Version describes the version table. Should have only one row with id==1
-type Version struct {
-	ID      int64 `xorm:"pk autoincr"`
-	Version int64
-}
-
-// DumpDatabaseOld dumps all data from database according the special database SQL syntax to file system.
-// NOTE: DEPRICATED in favour of DumpDatabase
-func DumpDatabaseOld(filePath string, dbType string) error {
+// DumpDatabase dumps all data from database according the special database SQL syntax to file system.
+func DumpDatabase(filePath string, dbType string) error {
 	var tbs []*core.Table
 	for _, t := range tables {
 		tbs = append(tbs, x.TableInfo(t).Table)
-		if len(dbType) > 0 {
-			return x.DumpTablesToFile(tbs, filePath, core.DbType(dbType))
-		}
 	}
-	return nil
-}
-
-// DumpDatabase dumps all data from database to file system in JSON format.
-func DumpDatabase(dirPath string) (err error) {
-	os.MkdirAll(dirPath, os.ModePerm)
-	// Purposely create a local variable to not modify global variable
-	internalTables := append(tables, new(Version))
-	for _, table := range internalTables {
-		tableName := strings.TrimPrefix(fmt.Sprintf("%T", table), "*models.")
-		tableFile := path.Join(dirPath, tableName+".json")
-		f, err := os.Create(tableFile)
-		if err != nil {
-			return fmt.Errorf("fail to create JSON file: %v", err)
-		}
-
-		if err = x.Asc("id").Iterate(table, func(idx int, bean interface{}) (err error) {
-			enc := json.NewEncoder(f)
-			return enc.Encode(bean)
-		}); err != nil {
-			f.Close()
-			return fmt.Errorf("fail to dump table '%s': %v", tableName, err)
-		}
-		f.Close()
+	if len(dbType) > 0 {
+		return x.DumpTablesToFile(tbs, filePath, core.DbType(dbType))
 	}
-	return nil
-}
-
-// ImportDatabase imports data from backup archive.
-func ImportDatabase(dirPath string) (err error) {
-	// Purposely create a local variable to not modify global variable
-	internalTables := append(tables, new(Version))
-	for _, table := range internalTables {
-		tableName := strings.TrimPrefix(fmt.Sprintf("%T", table), "*models.")
-		tableFile := path.Join(dirPath, tableName+".json")
-		if !com.IsExist(tableFile) {
-			continue
-		}
-
-		if err = x.DropTables(table); err != nil {
-			return fmt.Errorf("fail to drop table '%s': %v", tableName, err)
-		} else if err = x.Sync2(table); err != nil {
-			return fmt.Errorf("fail to sync table '%s': %v", tableName, err)
-		}
-
-		f, err := os.Open(tableFile)
-		if err != nil {
-			return fmt.Errorf("fail to open JSON file: %v", err)
-		}
-		scanner := bufio.NewScanner(f)
-		for scanner.Scan() {
-			switch bean := table.(type) {
-			case *LoginSource:
-				meta := make(map[string]interface{})
-				if err = json.Unmarshal(scanner.Bytes(), &meta); err != nil {
-					return fmt.Errorf("fail to unmarshal to map: %v", err)
-				}
-
-				tp := LoginType(com.StrTo(com.ToStr(meta["Type"])).MustInt64())
-				switch tp {
-				case LoginLDAP, LoginDLDAP:
-					bean.Cfg = new(LDAPConfig)
-				case LoginSMTP:
-					bean.Cfg = new(SMTPConfig)
-				case LoginPAM:
-					bean.Cfg = new(PAMConfig)
-				case LoginOAuth2:
-					bean.Cfg = new(OAuth2Config)
-				default:
-					return fmt.Errorf("unrecognized login source type:: %v", tp)
-				}
-				table = bean
-			}
-
-			if err = json.Unmarshal(scanner.Bytes(), table); err != nil {
-				return fmt.Errorf("fail to unmarshal to struct: %v", err)
-			}
-
-			if _, err = x.Insert(table); err != nil {
-				return fmt.Errorf("fail to insert strcut: %v", err)
-			}
-		}
-	}
-	return nil
+	return x.DumpTablesToFile(tbs, filePath)
 }

models/models_test.go

@@ -11,45 +11,15 @@ import (
 )
 
 func Test_parsePostgreSQLHostPort(t *testing.T) {
-	tests := []struct {
-		HostPort string
-		Host     string
-		Port     string
-	}{
-		{
-			HostPort: "127.0.0.1:1234",
-			Host:     "127.0.0.1",
-			Port:     "1234",
-		},
-		{
-			HostPort: "127.0.0.1",
-			Host:     "127.0.0.1",
-			Port:     "5432",
-		},
-		{
-			HostPort: "[::1]:1234",
-			Host:     "[::1]",
-			Port:     "1234",
-		},
-		{
-			HostPort: "[::1]",
-			Host:     "[::1]",
-			Port:     "5432",
-		},
-		{
-			HostPort: "/tmp/pg.sock:1234",
-			Host:     "/tmp/pg.sock",
-			Port:     "1234",
-		},
-		{
-			HostPort: "/tmp/pg.sock",
-			Host:     "/tmp/pg.sock",
-			Port:     "5432",
-		},
-	}
-	for _, test := range tests {
-		host, port := parsePostgreSQLHostPort(test.HostPort)
-		assert.Equal(t, test.Host, host)
-		assert.Equal(t, test.Port, port)
+	test := func(input, expectedHost, expectedPort string) {
+		host, port := parsePostgreSQLHostPort(input)
+		assert.Equal(t, expectedHost, host)
+		assert.Equal(t, expectedPort, port)
 	}
+	test("127.0.0.1:1234", "127.0.0.1", "1234")
+	test("127.0.0.1", "127.0.0.1", "5432")
+	test("[::1]:1234", "[::1]", "1234")
+	test("[::1]", "[::1]", "5432")
+	test("/tmp/pg.sock:1234", "/tmp/pg.sock", "1234")
+	test("/tmp/pg.sock", "/tmp/pg.sock", "5432")
 }

models/notification.go

@@ -96,11 +96,6 @@ func CreateOrUpdateIssueNotifications(issue *Issue, notificationAuthorID int64)
 }
 
 func createOrUpdateIssueNotifications(e Engine, issue *Issue, notificationAuthorID int64) error {
-	issueWatches, err := getIssueWatchers(e, issue.ID)
-	if err != nil {
-		return err
-	}
-
 	watches, err := getWatchers(e, issue.RepoID)
 	if err != nil {
 		return err
@@ -111,42 +106,23 @@ func createOrUpdateIssueNotifications(e Engine, issue *Issue, notificationAuthor
 		return err
 	}
 
-	alreadyNotified := make(map[int64]struct{}, len(issueWatches)+len(watches))
-
-	notifyUser := func(userID int64) error {
+	for _, watch := range watches {
 		// do not send notification for the own issuer/commenter
-		if userID == notificationAuthorID {
-			return nil
-		}
-
-		if _, ok := alreadyNotified[userID]; ok {
-			return nil
-		}
-		alreadyNotified[userID] = struct{}{}
-
-		if notificationExists(notifications, issue.ID, userID) {
-			return updateIssueNotification(e, userID, issue.ID, notificationAuthorID)
-		}
-		return createIssueNotification(e, userID, issue, notificationAuthorID)
-	}
-
-	for _, issueWatch := range issueWatches {
-		// ignore if user unwatched the issue
-		if !issueWatch.IsWatching {
-			alreadyNotified[issueWatch.UserID] = struct{}{}
+		if watch.UserID == notificationAuthorID {
 			continue
 		}
 
-		if err := notifyUser(issueWatch.UserID); err != nil {
+		if notificationExists(notifications, issue.ID, watch.UserID) {
+			err = updateIssueNotification(e, watch.UserID, issue.ID, notificationAuthorID)
+		} else {
+			err = createIssueNotification(e, watch.UserID, issue, notificationAuthorID)
+		}
+
+		if err != nil {
 			return err
 		}
 	}
 
-	for _, watch := range watches {
-		if err := notifyUser(watch.UserID); err != nil {
-			return err
-		}
-	}
 	return nil
 }
 

models/org.go

@@ -670,30 +670,13 @@ func (env *accessibleReposEnv) Repos(page, pageSize int) ([]*Repository, error)
 		Find(&repos)
 }
 
-func (env *accessibleReposEnv) MirrorRepoIDs() ([]int64, error) {
-	repoIDs := make([]int64, 0, 10)
-	return repoIDs, x.
-		Table("repository").
+func (env *accessibleReposEnv) MirrorRepos() ([]*Repository, error) {
+	repos := make([]*Repository, 0, 10)
+	return repos, x.
+		Select("`repository`.*").
 		Join("INNER", "team_repo", "`team_repo`.repo_id=`repository`.id AND `repository`.is_mirror=?", true).
 		Where(env.cond()).
 		GroupBy("`repository`.id").
 		OrderBy("updated_unix DESC").
-		Cols("`repository`.id").
-		Find(&repoIDs)
-}
-
-func (env *accessibleReposEnv) MirrorRepos() ([]*Repository, error) {
-	repoIDs, err := env.MirrorRepoIDs()
-	if err != nil {
-		return nil, fmt.Errorf("MirrorRepoIDs: %v", err)
-	}
-
-	repos := make([]*Repository, 0, len(repoIDs))
-	if len(repoIDs) <= 0 {
-		return repos, nil
-	}
-
-	return repos, x.
-		In("`repository`.id", repoIDs).
 		Find(&repos)
 }

models/org_team.go

@@ -139,19 +139,18 @@ func (t *Team) removeRepository(e Engine, repo *Repository, recalculate bool) (e
 		}
 	}
 
-	teamUsers, err := getTeamUsersByTeamID(e, t.ID)
-	if err != nil {
-		return fmt.Errorf("getTeamUsersByTeamID: %v", err)
+	if err = t.getMembers(e); err != nil {
+		return fmt.Errorf("get team members: %v", err)
 	}
-	for _, teamUser := range teamUsers {
-		has, err := hasAccess(e, teamUser.UID, repo, AccessModeRead)
+	for _, u := range t.Members {
+		has, err := hasAccess(e, u, repo, AccessModeRead)
 		if err != nil {
 			return err
 		} else if has {
 			continue
 		}
 
-		if err = watchRepo(e, teamUser.UID, repo.ID, false); err != nil {
+		if err = watchRepo(e, u.ID, repo.ID, false); err != nil {
 			return err
 		}
 	}
@@ -400,25 +399,20 @@ func IsTeamMember(orgID, teamID, userID int64) bool {
 	return isTeamMember(x, orgID, teamID, userID)
 }
 
-func getTeamUsersByTeamID(e Engine, teamID int64) ([]*TeamUser, error) {
-	teamUsers := make([]*TeamUser, 0, 10)
-	return teamUsers, e.
-		Where("team_id=?", teamID).
-		Find(&teamUsers)
-}
-
 func getTeamMembers(e Engine, teamID int64) (_ []*User, err error) {
-	teamUsers, err := getTeamUsersByTeamID(e, teamID)
-	if err != nil {
+	teamUsers := make([]*TeamUser, 0, 10)
+	if err = e.
+		Where("team_id=?", teamID).
+		Find(&teamUsers); err != nil {
 		return nil, fmt.Errorf("get team-users: %v", err)
 	}
-	members := make([]*User, len(teamUsers))
-	for i, teamUser := range teamUsers {
-		member, err := getUserByID(e, teamUser.UID)
-		if err != nil {
-			return nil, fmt.Errorf("get user '%d': %v", teamUser.UID, err)
+	members := make([]*User, 0, len(teamUsers))
+	for i := range teamUsers {
+		member := new(User)
+		if _, err = e.Id(teamUsers[i].UID).Get(member); err != nil {
+			return nil, fmt.Errorf("get user '%d': %v", teamUsers[i].UID, err)
 		}
-		members[i] = member
+		members = append(members, member)
 	}
 	return members, nil
 }

models/org_team_test.go

@@ -117,15 +117,15 @@ func TestTeam_HasRepository(t *testing.T) {
 func TestTeam_AddRepository(t *testing.T) {
 	assert.NoError(t, PrepareTestDatabase())
 
-	testSuccess := func(teamID, repoID int64) {
+	testSucess := func(teamID, repoID int64) {
 		team := AssertExistsAndLoadBean(t, &Team{ID: teamID}).(*Team)
 		repo := AssertExistsAndLoadBean(t, &Repository{ID: repoID}).(*Repository)
 		assert.NoError(t, team.AddRepository(repo))
 		AssertExistsAndLoadBean(t, &TeamRepo{TeamID: teamID, RepoID: repoID})
 		CheckConsistencyFor(t, &Team{ID: teamID}, &Repository{ID: repoID})
 	}
-	testSuccess(2, 3)
-	testSuccess(2, 5)
+	testSucess(2, 3)
+	testSucess(2, 5)
 
 	team := AssertExistsAndLoadBean(t, &Team{ID: 1}).(*Team)
 	repo := AssertExistsAndLoadBean(t, &Repository{ID: 1}).(*Repository)
@@ -243,7 +243,7 @@ func TestDeleteTeam(t *testing.T) {
 	// check that team members don't have "leftover" access to repos
 	user := AssertExistsAndLoadBean(t, &User{ID: 4}).(*User)
 	repo := AssertExistsAndLoadBean(t, &Repository{ID: 3}).(*Repository)
-	accessMode, err := AccessLevel(user.ID, repo)
+	accessMode, err := AccessLevel(user, repo)
 	assert.NoError(t, err)
 	assert.True(t, accessMode < AccessModeWrite)
 }