Skip to content

Commit bfbdc06

Browse files
Merge branch 'master' into use-base-repo-not-fork
2 parents d5ab55d + baffea1 commit bfbdc06

File tree

393 files changed

+44429
-2379
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

393 files changed

+44429
-2379
lines changed

.drone.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ pipeline:
127127
- curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
128128
- apt-get install -y git-lfs
129129
- (sleep 1200 && (echo 'kill -ABRT $(pidof gitea) $(pidof integrations.sqlite.test)' | sh)) &
130+
- make test-sqlite-migration
130131
- make test-sqlite
131132
when:
132133
event: [ push, tag, pull_request ]
@@ -141,6 +142,7 @@ pipeline:
141142
commands:
142143
- curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
143144
- apt-get install -y git-lfs
145+
- make test-mysql-migration
144146
- make integration-test-coverage
145147
when:
146148
event: [ push, pull_request ]
@@ -157,6 +159,7 @@ pipeline:
157159
- curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
158160
- apt-get install -y git-lfs
159161
- (sleep 1200 && (echo 'kill -ABRT $(pidof gitea) $(pidof integrations.test)' | sh)) &
162+
- make test-mysql-migration
160163
- make test-mysql
161164
when:
162165
event: [ tag ]
@@ -172,6 +175,7 @@ pipeline:
172175
- curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
173176
- apt-get install -y git-lfs
174177
- (sleep 1200 && (echo 'kill -ABRT $(pidof gitea) $(pidof integrations.test)' | sh)) &
178+
- make test-pgsql-migration
175179
- make test-pgsql
176180
when:
177181
event: [ push, tag, pull_request ]
@@ -186,10 +190,47 @@ pipeline:
186190
commands:
187191
- curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
188192
- apt-get install -y git-lfs
193+
- make test-mssql-migration
189194
- make test-mssql
190195
when:
191196
event: [ push, tag, pull_request ]
192197

198+
bench-sqlite:
199+
image: golang:1.11
200+
pull: true
201+
group: bench
202+
commands:
203+
- make bench-sqlite
204+
when:
205+
event: [ tag ]
206+
207+
bench-mysql:
208+
image: golang:1.11
209+
pull: true
210+
group: bench
211+
commands:
212+
- make bench-mysql
213+
when:
214+
event: [ tag ]
215+
216+
bench-mssql:
217+
image: golang:1.11
218+
pull: true
219+
group: bench
220+
commands:
221+
- make bench-mssql
222+
when:
223+
event: [ tag ]
224+
225+
bench-pgsql:
226+
image: golang:1.11
227+
pull: true
228+
group: bench
229+
commands:
230+
- make bench-pgsql
231+
when:
232+
event: [ tag ]
233+
193234
generate-coverage:
194235
image: golang:1.11
195236
pull: true

.editorconfig

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# http://editorconfig.org
2-
32
root = true
43

54
[*]
@@ -15,11 +14,11 @@ indent_size = 8
1514
indent_style = tab
1615
indent_size = 4
1716

18-
[*.{less}]
17+
[*.less]
1918
indent_style = space
2019
indent_size = 4
2120

22-
[*.{yml}]
21+
[*.{yml,json}]
2322
indent_style = space
2423
indent_size = 2
2524

CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,27 @@ This changelog goes through all the changes that have been made in each release
44
without substantial changes to our git log; to see the highlights of what has
55
been added to each release, please refer to the [blog](https://blog.gitea.io).
66

7+
## [1.7.1](https://github.com/go-gitea/gitea/releases/tag/v1.7.1) - 2019-01-31
8+
* SECURITY
9+
* Disable redirect for i18n (#5910) (#5916)
10+
* Only allow local login if password is non-empty (#5906) (#5908)
11+
* Fix go-get URL generation (#5905) (#5907)
12+
* BUGFIXES
13+
* Fix TLS errors when using acme/autocert for local connections (#5820) (#5826)
14+
* Request for public keys only if LDAP attribute is set (#5816) (#5819)
15+
* Fix delete correct temp directory (#5840) (#5839)
16+
* Fix an error while adding a dependency via UI (#5862) (#5876)
17+
* Fix null pointer in attempt to Sudo if not logged in (#5872) (#5884)
18+
* When creating new repository fsck option should be enabled (#5817) (#5885)
19+
* Prevent nil dereference in mailIssueCommentToParticipants (#5891) (#5895) (#5894)
20+
* Fix bug when read public repo lfs file (#5913) (#5912)
21+
* Respect value of REQUIRE_SIGNIN_VIEW (#5901) (#5915)
22+
* Fix compare button on upstream repo leading to 404 (#5877) (#5914)
23+
* DOCS
24+
* Added docs for the tree api (#5835)
25+
* MISC
26+
* Include Go toolchain to --version (#5832) (#5830)
27+
728
## [1.7.0](https://github.com/go-gitea/gitea/releases/tag/v1.7.0) - 2019-01-22
829
* SECURITY
930
* Do not display the raw OpenID error in the UI (#5705) (#5712)

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
###################################
33
#Build stage
4-
FROM golang:1.11-alpine3.8 AS build-env
4+
FROM golang:1.11-alpine3.9 AS build-env
55

66
ARG GITEA_VERSION
77
ARG TAGS="sqlite sqlite_unlock_notify"
@@ -18,7 +18,7 @@ WORKDIR ${GOPATH}/src/code.gitea.io/gitea
1818
RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
1919
&& make clean generate build
2020

21-
FROM alpine:3.8
21+
FROM alpine:3.9
2222
LABEL maintainer="[email protected]"
2323

2424
EXPOSE 22 3000

Gopkg.lock

Lines changed: 120 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)