Skip to content

Commit e1f22fe

Browse files
committed
Merge branch 'master' into feature/Pinned_repo
2 parents 56b6f99 + 03fa2ec commit e1f22fe

File tree

1,916 files changed

+191377
-54404
lines changed

Some content is hidden

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

1,916 files changed

+191377
-54404
lines changed

.changelog.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ groups:
2222
name: SECURITY
2323
labels:
2424
- kind/security
25+
-
26+
name: API
27+
labels:
28+
- kind/api
2529
-
2630
name: BUGFIXES
2731
labels:

.drone.yml

Lines changed: 63 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -113,18 +113,6 @@ services:
113113
environment:
114114
MYSQL_ALLOW_EMPTY_PASSWORD: yes
115115
MYSQL_DATABASE: test
116-
GOPROXY: off
117-
TAGS: bindata sqlite sqlite_unlock_notify
118-
GITLAB_READ_TOKEN:
119-
from_secret: gitlab_read_token
120-
depends_on:
121-
- build
122-
when:
123-
branch:
124-
- master
125-
event:
126-
- push
127-
- pull_request
128116

129117
- name: mysql8
130118
pull: default
@@ -152,7 +140,7 @@ services:
152140
image: elasticsearch:7.5.0
153141

154142
- name: minio
155-
image: minio/minio:RELEASE.2020-05-16T01-33-21Z
143+
image: minio/minio:RELEASE.2020-10-09T22-55-05Z
156144
commands:
157145
- minio server /data
158146
environment:
@@ -679,6 +667,28 @@ steps:
679667
exclude:
680668
- pull_request
681669

670+
- name: publish-rootless
671+
pull: always
672+
image: plugins/docker:linux-amd64
673+
settings:
674+
dockerfile: Dockerfile.rootless
675+
auto_tag: true
676+
auto_tag_suffix: linux-amd64-rootless
677+
repo: gitea/gitea
678+
build_args:
679+
- GOPROXY=off
680+
password:
681+
from_secret: docker_password
682+
username:
683+
from_secret: docker_username
684+
environment:
685+
PLUGIN_MIRROR:
686+
from_secret: plugin_mirror
687+
when:
688+
event:
689+
exclude:
690+
- pull_request
691+
682692
---
683693
kind: pipeline
684694
name: docker-linux-arm64-dry-run
@@ -708,6 +718,9 @@ steps:
708718
tags: linux-arm64
709719
build_args:
710720
- GOPROXY=off
721+
environment:
722+
PLUGIN_MIRROR:
723+
from_secret: plugin_mirror
711724
when:
712725
event:
713726
- pull_request
@@ -752,6 +765,31 @@ steps:
752765
from_secret: docker_password
753766
username:
754767
from_secret: docker_username
768+
environment:
769+
PLUGIN_MIRROR:
770+
from_secret: plugin_mirror
771+
when:
772+
event:
773+
exclude:
774+
- pull_request
775+
776+
- name: publish-rootless
777+
pull: always
778+
image: plugins/docker:linux-arm64
779+
settings:
780+
dockerfile: Dockerfile.rootless
781+
auto_tag: true
782+
auto_tag_suffix: linux-arm64-rootless
783+
repo: gitea/gitea
784+
build_args:
785+
- GOPROXY=off
786+
password:
787+
from_secret: docker_password
788+
username:
789+
from_secret: docker_username
790+
environment:
791+
PLUGIN_MIRROR:
792+
from_secret: plugin_mirror
755793
when:
756794
event:
757795
exclude:
@@ -766,6 +804,18 @@ platform:
766804
arch: amd64
767805

768806
steps:
807+
- name: manifest-rootless
808+
pull: always
809+
image: plugins/manifest
810+
settings:
811+
auto_tag: true
812+
ignore_missing: true
813+
spec: docker/manifest.rootless.tmpl
814+
password:
815+
from_secret: docker_password
816+
username:
817+
from_secret: docker_username
818+
769819
- name: manifest
770820
pull: always
771821
image: plugins/manifest

.eslintrc

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ parserOptions:
1111
plugins:
1212
- eslint-plugin-unicorn
1313
- eslint-plugin-import
14+
- eslint-plugin-vue
15+
16+
extends:
17+
- plugin:vue/recommended
1418

1519
env:
1620
es2021: true
@@ -24,7 +28,7 @@ globals:
2428
u2fApi: false
2529

2630
overrides:
27-
- files: ["web_src/**/*.js"]
31+
- files: ["web_src/**/*.js", "web_src/**/*.vue"]
2832
env:
2933
browser: true
3034
jquery: true
@@ -99,7 +103,7 @@ rules:
99103
import/no-amd: [0]
100104
import/no-anonymous-default-export: [0]
101105
import/no-commonjs: [0]
102-
import/no-cycle: [0]
106+
import/no-cycle: [2, {ignoreExternal: true}]
103107
import/no-default-export: [0]
104108
import/no-deprecated: [0]
105109
import/no-dynamic-require: [0]
@@ -117,7 +121,7 @@ rules:
117121
import/no-self-import: [2]
118122
import/no-unassigned-import: [0]
119123
import/no-unresolved: [2, {commonjs: true}]
120-
import/no-unused-modules: [0]
124+
import/no-unused-modules: [2, {unusedExports: true}]
121125
import/no-useless-path-segments: [2, {commonjs: true}]
122126
import/no-webpack-loader-syntax: [2]
123127
import/order: [0]
@@ -211,7 +215,7 @@ rules:
211215
no-mixed-operators: [0]
212216
no-mixed-spaces-and-tabs: [2]
213217
no-multi-assign: [0]
214-
no-multi-spaces: [2, {ignoreEOLComments: true, exceptions: {Property: true, VariableDeclarator: true}}]
218+
no-multi-spaces: [2, {ignoreEOLComments: true, exceptions: {Property: true}}]
215219
no-multi-str: [2]
216220
no-negated-condition: [0]
217221
no-nested-ternary: [0]
@@ -336,6 +340,7 @@ rules:
336340
unicorn/explicit-length-check: [0]
337341
unicorn/filename-case: [0]
338342
unicorn/import-index: [0]
343+
unicorn/import-style: [0]
339344
unicorn/new-for-builtins: [2]
340345
unicorn/no-abusive-eslint-disable: [0]
341346
unicorn/no-array-instanceof: [0]
@@ -356,11 +361,13 @@ rules:
356361
unicorn/no-useless-undefined: [0]
357362
unicorn/no-zero-fractions: [2]
358363
unicorn/number-literal-case: [0]
364+
unicorn/numeric-separators-style: [0]
359365
unicorn/prefer-add-event-listener: [2]
360366
unicorn/prefer-array-find: [2]
361367
unicorn/prefer-dataset: [2]
362368
unicorn/prefer-event-key: [2]
363369
unicorn/prefer-includes: [2]
370+
unicorn/prefer-math-trunc: [2]
364371
unicorn/prefer-modern-dom-apis: [0]
365372
unicorn/prefer-negative-index: [2]
366373
unicorn/prefer-node-append: [0]
@@ -374,6 +381,7 @@ rules:
374381
unicorn/prefer-spread: [0]
375382
unicorn/prefer-starts-ends-with: [2]
376383
unicorn/prefer-string-slice: [0]
384+
unicorn/prefer-ternary: [0]
377385
unicorn/prefer-text-content: [2]
378386
unicorn/prefer-trim-start-end: [2]
379387
unicorn/prefer-type-error: [0]
@@ -383,6 +391,11 @@ rules:
383391
use-isnan: [2]
384392
valid-typeof: [2, {requireStringLiterals: true}]
385393
vars-on-top: [0]
394+
vue/attributes-order: [0]
395+
vue/component-definition-name-casing: [0]
396+
vue/html-closing-bracket-spacing: [0]
397+
vue/max-attributes-per-line: [0]
398+
vue/one-component-per-file: [0]
386399
wrap-iife: [2, inside]
387400
wrap-regex: [0]
388401
yield-star-spacing: [2, after]

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
* text=auto eol=lf
22
/vendor/** -text -eol linguist-vendored
33
/public/vendor/** -text -eol linguist-vendored
4+
/templates/**/*.tmpl linguist-language=Handlebars

.github/issue_template.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
- Gitea version (or commit ref):
1313
- Git version:
1414
- Operating system:
15+
<!-- Please include information on whether you built gitea yourself, used one of our downloads or are using some other package -->
16+
<!-- Please also tell us how you are running gitea, e.g. if it is being run from docker, a command-line, systemd etc. --->
17+
<!-- If you are using a package or systemd tell us what distribution you are using -->
1518
- Database (use `[x]`):
1619
- [ ] PostgreSQL
1720
- [ ] MySQL
@@ -20,8 +23,10 @@
2023
- Can you reproduce the bug at https://try.gitea.io:
2124
- [ ] Yes (provide example URL)
2225
- [ ] No
23-
- [ ] Not relevant
2426
- Log gist:
27+
<!-- It really is important to provide pertinent logs -->
28+
<!-- Please read https://docs.gitea.io/en-us/logging-configuration/#debugging-problems -->
29+
<!-- In addition, if your problem relates to git commands set `RUN_MODE=dev` at the top of app.ini -->
2530

2631
## Description
2732

.github/lock.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Configuration for Lock Threads - https://github.com/dessant/lock-threads-app
2+
3+
# Number of days of inactivity before a closed issue or pull request is locked
4+
daysUntilLock: 60
5+
6+
# Skip issues and pull requests created before a given timestamp. Timestamp must
7+
# follow ISO 8601 (`YYYY-MM-DD`). `false` is disabled
8+
skipCreatedBefore: false
9+
10+
# Issues and pull requests with these labels will be ignored.
11+
exemptLabels: []
12+
13+
# Label to add before locking, such as `outdated`. `false` is disabled
14+
lockLabel: false
15+
16+
# Comment to post before locking.
17+
lockComment: >
18+
This thread has been automatically locked since there has not been
19+
any recent activity after it was closed. Please open a new issue for
20+
related bugs and link to relevant comments in this thread.
21+
22+
# Assign `resolved` as the reason for locking. Set to `false` to disable
23+
setLockReason: true

.gitignore

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,17 @@ coverage.all
8080
/public/css
8181
/public/fonts
8282
/public/img/webpack
83-
/web_src/fomantic/build
83+
/web_src/fomantic/build/*
84+
!/web_src/fomantic/build/semantic.js
85+
!/web_src/fomantic/build/semantic.css
86+
!/web_src/fomantic/build/themes
87+
/web_src/fomantic/build/themes/*
88+
!/web_src/fomantic/build/themes/default
89+
/web_src/fomantic/build/themes/default/assets/*
90+
!/web_src/fomantic/build/themes/default/assets/fonts
91+
/web_src/fomantic/build/themes/default/assets/fonts/*
92+
!/web_src/fomantic/build/themes/default/assets/fonts/icons.woff2
93+
!/web_src/fomantic/build/themes/default/assets/fonts/outline-icons.woff2
8494
/VERSION
8595
/.air
8696

.golangci.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ issues:
7070
- path: modules/log/
7171
linters:
7272
- errcheck
73-
- path: routers/routes/routes.go
73+
- path: routers/routes/macaron.go
7474
linters:
7575
- dupl
7676
- path: routers/api/v1/repo/issue_subscription.go
@@ -98,3 +98,12 @@ issues:
9898
- path: models/update.go
9999
linters:
100100
- unused
101+
- path: cmd/dump.go
102+
linters:
103+
- dupl
104+
- text: "commentFormatting: put a space between `//` and comment text"
105+
linters:
106+
- gocritic
107+
- text: "exitAfterDefer:"
108+
linters:
109+
- gocritic

.stylelintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ rules:
1111
no-descending-specificity: null
1212
number-leading-zero: never
1313
rule-empty-line-before: null
14-
selector-pseudo-element-colon-notation: null
14+
selector-pseudo-element-colon-notation: double
1515
shorthand-property-no-redundant-values: true

0 commit comments

Comments
 (0)