Skip to content

Commit cc7a479

Browse files
committed
Merge remote-tracking branch 'origin/master' into repo_transfer
2 parents 2d759fb + 8c865f3 commit cc7a479

File tree

311 files changed

+41079
-1025
lines changed

Some content is hidden

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

311 files changed

+41079
-1025
lines changed

.drone.yml

Lines changed: 5 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,6 +190,7 @@ 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 ]

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ indent_size = 8
1515
indent_style = tab
1616
indent_size = 4
1717

18-
[*.{less}]
18+
[*.less]
1919
indent_style = space
2020
indent_size = 4
2121

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: 116 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Makefile

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ endif
3535

3636
LDFLAGS := -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)"
3737

38-
PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations,$(shell $(GO) list ./... | grep -v /vendor/))
38+
PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations/migration-test,$(filter-out code.gitea.io/gitea/integrations,$(shell $(GO) list ./... | grep -v /vendor/)))
3939
SOURCES ?= $(shell find . -name "*.go" -type f)
4040

4141
TAGS ?=
@@ -197,6 +197,10 @@ test-vendor: vendor
197197
test-sqlite: integrations.sqlite.test
198198
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test
199199

200+
.PHONY: test-sqlite-migration
201+
test-sqlite-migration: migrations.sqlite.test
202+
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./migrations.sqlite.test
203+
200204
generate-ini:
201205
sed -e 's|{{TEST_MYSQL_HOST}}|${TEST_MYSQL_HOST}|g' \
202206
-e 's|{{TEST_MYSQL_DBNAME}}|${TEST_MYSQL_DBNAME}|g' \
@@ -218,14 +222,28 @@ generate-ini:
218222
test-mysql: integrations.test generate-ini
219223
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.test
220224

225+
.PHONY: test-mysql-migration
226+
test-mysql-migration: migrations.test generate-ini
227+
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./migrations.test
228+
221229
.PHONY: test-pgsql
222230
test-pgsql: integrations.test generate-ini
223231
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./integrations.test
224232

233+
.PHONY: test-pgsql-migration
234+
test-pgsql-migration: migrations.test generate-ini
235+
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./migrations.test
236+
237+
225238
.PHONY: test-mssql
226239
test-mssql: integrations.test generate-ini
227240
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mssql.ini ./integrations.test
228241

242+
.PHONY: test-mssql-migration
243+
test-mssql-migration: migrations.test generate-ini
244+
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mssql.ini ./migrations.test
245+
246+
229247
.PHONY: bench-sqlite
230248
bench-sqlite: integrations.sqlite.test
231249
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench .
@@ -252,6 +270,14 @@ integrations.sqlite.test: $(SOURCES)
252270
integrations.cover.test: $(SOURCES)
253271
$(GO) test -c code.gitea.io/gitea/integrations -coverpkg $(shell echo $(PACKAGES) | tr ' ' ',') -o integrations.cover.test
254272

273+
.PHONY: migrations.test
274+
migrations.test: $(SOURCES)
275+
$(GO) test -c code.gitea.io/gitea/integrations/migration-test -o migrations.test
276+
277+
.PHONY: migrations.sqlite.test
278+
migrations.sqlite.test: $(SOURCES)
279+
$(GO) test -c code.gitea.io/gitea/integrations/migration-test -o migrations.sqlite.test -tags 'sqlite sqlite_unlock_notify'
280+
255281
.PHONY: check
256282
check: test
257283

0 commit comments

Comments
 (0)