Skip to content

Commit 40de404

Browse files
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Add line-through for deleted branch on pull request view page (go-gitea#32500) Fix issue sidebar regression (go-gitea#32598) Fix PR diff review form submit (go-gitea#32596) Fix some typescript issues (go-gitea#32586) Fix GetInactiveUsers (go-gitea#32540) disable gravatar in test (go-gitea#32529) Add 'Copy path' button to file view (go-gitea#32584) Improve issue sidebar UI (go-gitea#32587) Supplement and Improvement for go-gitea#32558 (go-gitea#32585) make search box in issue sidebar dropdown list always show when scrolling (go-gitea#32576) Fix submodule parsing (go-gitea#32571) allow the actions user to login via the jwt token (go-gitea#32527) Support HTTP POST requests to `/userinfo`, aligning to OpenID Core specification (go-gitea#32578)
2 parents a8b8d32 + a175f98 commit 40de404

Some content is hidden

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

75 files changed

+990
-694
lines changed

.eslintrc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ rules:
642642
no-this-before-super: [2]
643643
no-throw-literal: [2]
644644
no-undef-init: [2]
645-
no-undef: [2, {typeof: true}]
645+
no-undef: [2, {typeof: true}] # TODO: disable this rule after tsc passes
646646
no-undefined: [0]
647647
no-underscore-dangle: [0]
648648
no-unexpected-multiline: [2]

models/fixtures/action_task.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
-
2+
id: 46
3+
attempt: 3
4+
runner_id: 1
5+
status: 3 # 3 is the status code for "cancelled"
6+
started: 1683636528
7+
stopped: 1683636626
8+
repo_id: 4
9+
owner_id: 1
10+
commit_sha: c2d72f548424103f01ee1dc02889c1e2bff816b0
11+
is_fork_pull_request: 0
12+
token_hash: 6d8ef48297195edcc8e22c70b3020eaa06c52976db67d39b4260c64a69a2cc1508825121b7b8394e48e00b1bf8718b2aaaaa
13+
token_salt: eeeeeeee
14+
token_last_eight: eeeeeeee
15+
log_filename: artifact-test2/2f/47.log
16+
log_in_storage: 1
17+
log_length: 707
18+
log_size: 90179
19+
log_expired: 0
120
-
221
id: 47
322
job_id: 192

models/fixtures/system_setting.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
-
22
id: 1
33
setting_key: 'picture.disable_gravatar'
4-
setting_value: 'false'
4+
setting_value: 'true'
55
version: 1
66
created: 1653533198
77
updated: 1653533198

0 commit comments

Comments
 (0)