Skip to content

Commit 7863e53

Browse files
committed
Merge branch 'master' into empty_pr
* master: (542 commits) [skip ci] Updated translations via Crowdin Use caddy's certmagic library for extensible/robust ACME handling (go-gitea#14177) Redirect on changed user and org name (go-gitea#11649) chore: bump minio to RELEASE.2021-01-16T02-19-44Z (go-gitea#14445) [skip ci] Updated translations via Crowdin CI: skip build steps for cron update works (go-gitea#14443) [skip ci] Updated licenses and gitignores [skip ci] Updated translations via Crowdin just overload to not get it by mistake again ... (go-gitea#14440) [skip ci] Updated translations via Crowdin Add link to packages in openSUSE build service (go-gitea#14439) Improve Description in new/ edit Project template (go-gitea#14429) Don't show "Reference in new issue" when issues unit is globally disabled (go-gitea#14437) CI: Update license & gitignore by cron (go-gitea#14419) Fix close/reopen with comment (go-gitea#14436) Add german translation guidelines (go-gitea#14283) [skip ci] Updated translations via Crowdin Fix lfs preview bug (go-gitea#14428) [skip ci] Updated translations via Crowdin Bump gsap from 3.5.1 to 3.6.0 (go-gitea#14410) ...
2 parents 18e8627 + efe4235 commit 7863e53

2,984 files changed

Lines changed: 280412 additions & 117908 deletions

File tree

Some content is hidden

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

.drone.yml

Lines changed: 177 additions & 31 deletions
Large diffs are not rendered by default.

.eslintrc

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,22 @@ reportUnusedDisableDirectives: true
33

44
ignorePatterns:
55
- /web_src/js/vendor
6+
- /templates/base/head.tmpl
7+
- /templates/repo/activity.tmpl
8+
- /templates/repo/view_file.tmpl
69

710
parserOptions:
811
sourceType: module
9-
ecmaVersion: 2020
12+
ecmaVersion: 2021
1013

1114
plugins:
1215
- eslint-plugin-unicorn
1316
- eslint-plugin-import
17+
- eslint-plugin-vue
18+
- eslint-plugin-html
19+
20+
extends:
21+
- plugin:vue/recommended
1422

1523
env:
1624
es2021: true
@@ -23,12 +31,19 @@ globals:
2331
SimpleMDE: false
2432
u2fApi: false
2533

34+
settings:
35+
html/html-extensions: [".tmpl"]
36+
2637
overrides:
27-
- files: ["web_src/**/*.js"]
38+
- files: ["web_src/**/*.js", "web_src/**/*.vue", "templates/**/*.tmpl"]
2839
env:
2940
browser: true
3041
jquery: true
3142
node: false
43+
- files: ["templates/**/*.tmpl"]
44+
rules:
45+
no-tabs: [0]
46+
indent: [2, tab, {SwitchCase: 1}]
3247
- files: ["web_src/**/*worker.js"]
3348
env:
3449
worker: true
@@ -220,6 +235,7 @@ rules:
220235
no-new-symbol: [2]
221236
no-new-wrappers: [2]
222237
no-new: [0]
238+
no-nonoctal-decimal-escape: [2]
223239
no-obj-calls: [2]
224240
no-octal-escape: [2]
225241
no-octal: [2]
@@ -330,6 +346,7 @@ rules:
330346
unicorn/catch-error-name: [0]
331347
unicorn/consistent-function-scoping: [2]
332348
unicorn/custom-error-definition: [0]
349+
unicorn/empty-brace-spaces: [2]
333350
unicorn/error-message: [0]
334351
unicorn/escape-case: [0]
335352
unicorn/expiring-todo-comments: [0]
@@ -345,6 +362,7 @@ rules:
345362
unicorn/no-for-loop: [0]
346363
unicorn/no-hex-escape: [0]
347364
unicorn/no-keyword-prefix: [0]
365+
unicorn/no-lonely-if: [2]
348366
unicorn/no-nested-ternary: [0]
349367
unicorn/no-new-buffer: [0]
350368
unicorn/no-null: [0]
@@ -361,6 +379,7 @@ rules:
361379
unicorn/prefer-add-event-listener: [2]
362380
unicorn/prefer-array-find: [2]
363381
unicorn/prefer-dataset: [2]
382+
unicorn/prefer-date-now: [2]
364383
unicorn/prefer-event-key: [2]
365384
unicorn/prefer-includes: [2]
366385
unicorn/prefer-math-trunc: [2]
@@ -387,6 +406,11 @@ rules:
387406
use-isnan: [2]
388407
valid-typeof: [2, {requireStringLiterals: true}]
389408
vars-on-top: [0]
409+
vue/attributes-order: [0]
410+
vue/component-definition-name-casing: [0]
411+
vue/html-closing-bracket-spacing: [0]
412+
vue/max-attributes-per-line: [0]
413+
vue/one-component-per-file: [0]
390414
wrap-iife: [2, inside]
391415
wrap-regex: [0]
392416
yield-star-spacing: [2, after]

.gitattributes

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

.github/FUNDING.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
open_collective: gitea
2+
custom: https://www.bountysource.com/teams/gitea

.github/issue_template.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
<!--
44
1. Please speak English, this is the language all maintainers can speak and write.
5-
2. Please ask questions or configuration/deploy problems on our Discord
5+
2. Please ask questions or configuration/deploy problems on our Discord
66
server (https://discord.gg/gitea) or forum (https://discourse.gitea.io).
77
3. Please take a moment to check that your issue doesn't already exist.
8-
4. Please give all relevant information below for bug reports, because
8+
4. Make sure it's not mentioned in the FAQ (https://docs.gitea.io/en-us/faq)
9+
5. Please give all relevant information below for bug reports, because
910
incomplete details will be handled as an invalid report.
1011
-->
1112

.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: 4 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
@@ -101,6 +101,9 @@ issues:
101101
- path: cmd/dump.go
102102
linters:
103103
- dupl
104+
- path: services/webhook/webhook.go
105+
linters:
106+
- structcheck
104107
- text: "commentFormatting: put a space between `//` and comment text"
105108
linters:
106109
- gocritic

.npmrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
audit=false
2+
fund=false
13
package-lock=true
24
save-exact=true

.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)