Skip to content

Fix conflicts #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 69 commits into from
Sep 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
cf40619
[skip ci] Updated translations via Crowdin
Aug 2, 2022
ae3b88b
Add default value for clone URLs (#20600)
silverwind Aug 2, 2022
036dd8a
Rework mailer settings (#18982)
clarfonthey Aug 2, 2022
8740631
Enable Wire 2 for Internal SSH Server (#20616)
Aug 2, 2022
e43bb2b
Add info about Wire 2 when Git over SSH (#20619)
Aug 2, 2022
631539c
Fix package upload for files >32mb (#20622)
KN4CK3R Aug 2, 2022
2754ecc
Use correct page size for link header pagination (#20546)
noerw Aug 2, 2022
90b2657
Fix the admin mailer config display (#20633)
wxiaoguang Aug 2, 2022
87a7c37
Use `strings.Cut` for GIT_PROTOCOL value (#20638)
Aug 2, 2022
7baa7cb
[skip ci] Updated translations via Crowdin
Aug 3, 2022
7a31292
Add default commit messages to PR for squash merge (#20618)
tyroneyeh Aug 3, 2022
99fc419
Send correct NuGet status codes (#20647)
KN4CK3R Aug 3, 2022
96440e6
Fix the JS error "EventSource is not defined" caused by some non-stan…
wxiaoguang Aug 3, 2022
b6bb389
[skip ci] Updated translations via Crowdin
wxiaoguang Aug 4, 2022
6c218f7
Check issue labels slice length before calling xorm Insert; fixes #20…
gabriel-vasile Aug 4, 2022
cf06e20
Check webhooks slice length before calling xorm (#20642)
gabriel-vasile Aug 4, 2022
7cc7c3e
Executable check always returns true for windows (#20637)
eeyrjmr Aug 4, 2022
b678d1a
Use correct context to get package content (#20673)
KN4CK3R Aug 4, 2022
0f767e7
[skip ci] Updated translations via Crowdin
KN4CK3R Aug 5, 2022
ba0a0d3
Use correct field name. (#20675)
KN4CK3R Aug 5, 2022
42d9a6a
move handleGlobalEnterQuickSubmit into a separate file to avoid cycle…
wxiaoguang Aug 5, 2022
8a66967
Add a notice for breaking check in upgrade document (#20682)
wxiaoguang Aug 5, 2022
d890f0d
docs: update comparison.zh-cn.md (#20656)
Aug 5, 2022
baf374a
Allow multiple metadata files for Maven packages (#20674)
KN4CK3R Aug 5, 2022
61aafb9
[skip ci] Updated translations via Crowdin
KN4CK3R Aug 6, 2022
279e4e2
Increase default item listing size `ISSUE_PAGING_NUM` to 20 (#20547)
noerw Aug 6, 2022
2778990
Use request timeout for git service rpc (#20689)
parnic Aug 6, 2022
fe78d35
Background color of private list-items updated (#20630)
lukeawyatt Aug 6, 2022
dba14dc
Update JS dependencies, adjust eslint (#20659)
silverwind Aug 6, 2022
cb97114
[skip ci] Updated licenses and gitignores
silverwind Aug 7, 2022
d4326af
Fix typo overrided -> overridden (#20687)
luzpaz Aug 7, 2022
f55af46
Add support for Pub packages (#20560)
KN4CK3R Aug 7, 2022
64c371a
Update maven deploy docs (#20691)
KN4CK3R Aug 7, 2022
be82489
Switch to building with go1.19 (#20695)
techknowlogick Aug 7, 2022
abdebd2
Rework repo buttons (#20602)
silverwind Aug 7, 2022
5b4a84b
Fix v220 migration to be compatible for MSSQL 2008 r2 (#20702)
lunny Aug 8, 2022
73e9854
[skip ci] Updated translations via Crowdin
lunny Aug 8, 2022
498352c
Fix SecToTime edge-cases (#20610)
Aug 8, 2022
68059ab
docs: move search input to navbar (#20551)
noerw Aug 8, 2022
98190d0
Fix disable download button (#20701)
lunny Aug 8, 2022
ccf03e1
Frontport changelog v1.17.0 (#20712)
6543 Aug 8, 2022
2b10199
Fix init mail render logic (#20704)
KN4CK3R Aug 8, 2022
0066bc5
Add issue filter for Author (#20578)
parnic Aug 8, 2022
2660b03
[skip ci] Updated translations via Crowdin
parnic Aug 9, 2022
820031e
Fix typo in source (#20723)
luzpaz Aug 9, 2022
75d96f4
Refactor legacy git init (#20376)
wxiaoguang Aug 9, 2022
cc6927b
Allow multiple files in generic packages (#20661)
KN4CK3R Aug 9, 2022
fba2055
Add support for `npm unpublish` (#20688)
KN4CK3R Aug 9, 2022
871082b
Remove manual rollback for failed generated repositories (#20639)
gabriel-vasile Aug 9, 2022
33b03e8
Restore history button and hide add button when unable to add (#20718)
silverwind Aug 9, 2022
36f9ee5
Add an option to create new issues from "/issues" page (#20650)
CodeDoctorDE Aug 9, 2022
1b2cd4c
Replace fomantic popup module with tippy.js (#20428)
silverwind Aug 9, 2022
9204813
Keep download count on Container tag overwrite (#20728)
KN4CK3R Aug 9, 2022
7009eb9
Add support for NuGet API keys (#20721)
KN4CK3R Aug 9, 2022
89505ac
Change commit status icons to SVG (#20736)
silverwind Aug 9, 2022
77d7b4c
[skip ci] Updated translations via Crowdin
silverwind Aug 10, 2022
1a538df
Add documentation about pagination of the API (#20740)
techknowlogick Aug 10, 2022
452272c
Fix CI status popup (#20737)
silverwind Aug 10, 2022
58de07e
Add support mCaptcha as captcha provider (#20458)
Aug 10, 2022
d751e35
Use separate class for tippy targets (#20742)
silverwind Aug 10, 2022
802c531
Replace some icons with SVG (#20741)
silverwind Aug 10, 2022
3d76d60
Update docs for versions (#20750)
wxiaoguang Aug 10, 2022
c315868
Make branch icon stand out more (#20726)
Aug 10, 2022
54d9816
[skip ci] Updated translations via Crowdin
Aug 11, 2022
57f1ea0
Fix loading button with invalid form (#20754)
silverwind Aug 11, 2022
2b4d43d
Add SAML SP status to Feature Comparison docs (#20743)
Mortein Aug 11, 2022
c81b26b
refactor webhook *NewPost (#20729)
oliverpool Aug 11, 2022
d26b652
Fix disabled open in vscode menu when disabling download source from …
lunny Aug 12, 2022
e1d141e
Merge commit d26b6522 into vscode-ssh-2
monim67 Aug 26, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ steps:
- make deps-frontend

- name: deps-backend
image: golang:1.18
image: golang:1.19
pull: always
commands:
- make deps-backend
Expand Down Expand Up @@ -88,7 +88,7 @@ steps:
depends_on: [deps-frontend]

- name: checks-backend
image: golang:1.18
image: golang:1.19
commands:
- make checks-backend
depends_on: [deps-backend]
Expand Down Expand Up @@ -122,7 +122,7 @@ steps:
path: /go

- name: build-backend-arm64
image: golang:1.18
image: golang:1.19
environment:
GO111MODULE: on
GOPROXY: https://goproxy.io
Expand All @@ -138,7 +138,7 @@ steps:
path: /go

- name: build-backend-windows
image: golang:1.18
image: golang:1.19
environment:
GO111MODULE: on
GOPROXY: https://goproxy.io
Expand All @@ -153,7 +153,7 @@ steps:
path: /go

- name: build-backend-386
image: golang:1.18
image: golang:1.19
environment:
GO111MODULE: on
GOPROXY: https://goproxy.io
Expand Down Expand Up @@ -243,7 +243,7 @@ steps:
- pull_request

- name: deps-backend
image: golang:1.18
image: golang:1.19
pull: always
commands:
- make deps-backend
Expand Down Expand Up @@ -360,7 +360,7 @@ steps:
path: /go

- name: generate-coverage
image: golang:1.18
image: golang:1.19
commands:
- make coverage
environment:
Expand Down Expand Up @@ -436,7 +436,7 @@ steps:
- pull_request

- name: deps-backend
image: golang:1.18
image: golang:1.19
pull: always
commands:
- make deps-backend
Expand Down Expand Up @@ -578,7 +578,7 @@ trigger:

steps:
- name: download
image: golang:1.18
image: golang:1.19
pull: always
commands:
- timeout -s ABRT 40m make generate-license generate-gitignore
Expand Down Expand Up @@ -640,7 +640,7 @@ steps:
- make deps-frontend

- name: deps-backend
image: golang:1.18
image: golang:1.19
pull: always
commands:
- make deps-backend
Expand All @@ -649,7 +649,7 @@ steps:
path: /go

- name: static
image: techknowlogick/xgo:go-1.18.x
image: techknowlogick/xgo:go-1.19.x
pull: always
commands:
# Upgrade to node 18 once https://github.com/techknowlogick/xgo/issues/163 is resolved
Expand Down Expand Up @@ -760,7 +760,7 @@ steps:
- make deps-frontend

- name: deps-backend
image: golang:1.18
image: golang:1.19
pull: always
commands:
- make deps-backend
Expand All @@ -769,7 +769,7 @@ steps:
path: /go

- name: static
image: techknowlogick/xgo:go-1.18.x
image: techknowlogick/xgo:go-1.19.x
pull: always
commands:
# Upgrade to node 18 once https://github.com/techknowlogick/xgo/issues/163 is resolved
Expand Down
18 changes: 9 additions & 9 deletions .eslintrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ overrides:
env:
worker: true
rules:
no-restricted-globals: [2, addEventListener, blur, close, closed, confirm, defaultStatus, defaultstatus, error, event, external, find, focus, frameElement, frames, history, innerHeight, innerWidth, isFinite, isNaN, length, location, locationbar, menubar, moveBy, moveTo, name, onblur, onerror, onfocus, onload, onresize, onunload, open, opener, opera, outerHeight, outerWidth, pageXOffset, pageYOffset, parent, print, removeEventListener, resizeBy, resizeTo, screen, screenLeft, screenTop, screenX, screenY, scroll, scrollbars, scrollBy, scrollTo, scrollX, scrollY, status, statusbar, stop, toolbar, top]
no-restricted-globals: [2, addEventListener, blur, close, closed, confirm, defaultStatus, defaultstatus, error, event, external, find, focus, frameElement, frames, history, innerHeight, innerWidth, isFinite, isNaN, length, locationbar, menubar, moveBy, moveTo, name, onblur, onerror, onfocus, onload, onresize, onunload, open, opener, opera, outerHeight, outerWidth, pageXOffset, pageYOffset, parent, print, removeEventListener, resizeBy, resizeTo, screen, screenLeft, screenTop, screenX, screenY, scroll, scrollbars, scrollBy, scrollTo, scrollX, scrollY, status, statusbar, stop, toolbar, top]
- files: ["build/generate-images.js"]
rules:
import/no-unresolved: [0]
Expand Down Expand Up @@ -109,7 +109,7 @@ rules:
import/no-extraneous-dependencies: [2]
import/no-import-module-exports: [0]
import/no-internal-modules: [0]
import/no-mutable-exports: [2]
import/no-mutable-exports: [0]
import/no-named-as-default-member: [0]
import/no-named-as-default: [2]
import/no-named-default: [0]
Expand All @@ -121,7 +121,7 @@ rules:
import/no-restricted-paths: [0]
import/no-self-import: [2]
import/no-unassigned-import: [0]
import/no-unresolved: [2, {commonjs: true}]
import/no-unresolved: [2, {commonjs: true, ignore: ["\\?.+$"]}]
import/no-unused-modules: [2, {unusedExports: true}]
import/no-useless-path-segments: [2, {commonjs: true}]
import/no-webpack-loader-syntax: [2]
Expand Down Expand Up @@ -211,7 +211,7 @@ rules:
no-compare-neg-zero: [2]
no-cond-assign: [2, except-parens]
no-confusing-arrow: [0]
no-console: [1, {allow: [info, warn, error]}]
no-console: [1, {allow: [debug, info, warn, error]}]
no-const-assign: [2]
no-constant-binary-expression: [2]
no-constant-condition: [0]
Expand Down Expand Up @@ -287,7 +287,7 @@ rules:
no-redeclare: [2]
no-regex-spaces: [2]
no-restricted-exports: [0]
no-restricted-globals: [2, addEventListener, blur, close, closed, confirm, defaultStatus, defaultstatus, error, event, external, find, focus, frameElement, frames, history, innerHeight, innerWidth, isFinite, isNaN, length, location, locationbar, menubar, moveBy, moveTo, name, onblur, onerror, onfocus, onload, onresize, onunload, open, opener, opera, outerHeight, outerWidth, pageXOffset, pageYOffset, parent, print, removeEventListener, resizeBy, resizeTo, screen, screenLeft, screenTop, screenX, screenY, scroll, scrollbars, scrollBy, scrollTo, scrollX, scrollY, self, status, statusbar, stop, toolbar, top]
no-restricted-globals: [2, addEventListener, blur, close, closed, confirm, defaultStatus, defaultstatus, error, event, external, find, focus, frameElement, frames, history, innerHeight, innerWidth, isFinite, isNaN, length, location, locationbar, menubar, moveBy, moveTo, name, onblur, onerror, onfocus, onload, onresize, onunload, open, opener, opera, outerHeight, outerWidth, pageXOffset, pageYOffset, parent, print, removeEventListener, resizeBy, resizeTo, screen, screenLeft, screenTop, screenX, screenY, scroll, scrollbars, scrollBy, scrollTo, scrollX, scrollY, self, status, statusbar, stop, toolbar, top, __dirname, __filename]
no-restricted-imports: [0]
no-restricted-syntax: [2, WithStatement, ForInStatement, LabeledStatement]
no-return-assign: [0]
Expand Down Expand Up @@ -321,7 +321,7 @@ rules:
no-unused-labels: [2]
no-unused-private-class-members: [2]
no-unused-vars: [2, {args: all, argsIgnorePattern: ^_, varsIgnorePattern: ^_, caughtErrorsIgnorePattern: ^_, destructuredArrayIgnorePattern: ^_, ignoreRestSiblings: false}]
no-use-before-define: [2, nofunc]
no-use-before-define: [2, {functions: false, classes: true, variables: true, allowNamedExports: true}]
no-useless-backreference: [0]
no-useless-call: [2]
no-useless-catch: [2]
Expand All @@ -347,7 +347,7 @@ rules:
padded-blocks: [2, never]
padding-line-between-statements: [0]
prefer-arrow-callback: [2, {allowNamedFunctions: true, allowUnboundThis: true}]
prefer-const: [2, {destructuring: all}]
prefer-const: [2, {destructuring: all, ignoreReadBeforeAssign: true}]
prefer-destructuring: [0]
prefer-exponentiation-operator: [2]
prefer-named-capture-group: [0]
Expand Down Expand Up @@ -449,7 +449,7 @@ rules:
unicorn/no-new-array: [0]
unicorn/no-new-buffer: [0]
unicorn/no-null: [0]
unicorn/no-object-as-default-parameter: [2]
unicorn/no-object-as-default-parameter: [0]
unicorn/no-process-exit: [0]
unicorn/no-reduce: [2]
unicorn/no-static-only-class: [2]
Expand All @@ -475,7 +475,7 @@ rules:
unicorn/prefer-array-index-of: [2]
unicorn/prefer-array-some: [2]
unicorn/prefer-at: [0]
unicorn/prefer-code-point: [2]
unicorn/prefer-code-point: [0]
unicorn/prefer-dataset: [2]
unicorn/prefer-date-now: [2]
unicorn/prefer-default-parameters: [0]
Expand Down
4 changes: 2 additions & 2 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ linters:
fast: false

run:
go: 1.18
go: 1.19
timeout: 10m
skip-dirs:
- node_modules
Expand Down Expand Up @@ -75,7 +75,7 @@ linters-settings:
- name: modifies-value-receiver
gofumpt:
extra-rules: true
lang-version: "1.18"
lang-version: "1.19"
depguard:
# TODO: use depguard to replace import checks in gitea-vet
list-type: denylist
Expand Down
Loading