Skip to content

Commit

Permalink
Merge remote-tracking branch 'giteaofficial/main'
Browse files Browse the repository at this point in the history
* 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)
  • Loading branch information
zjjhot committed Nov 22, 2024
2 parents a8b8d32 + a175f98 commit 40de404
Show file tree
Hide file tree
Showing 75 changed files with 990 additions and 694 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ rules:
no-this-before-super: [2]
no-throw-literal: [2]
no-undef-init: [2]
no-undef: [2, {typeof: true}]
no-undef: [2, {typeof: true}] # TODO: disable this rule after tsc passes
no-undefined: [0]
no-underscore-dangle: [0]
no-unexpected-multiline: [2]
Expand Down
19 changes: 19 additions & 0 deletions models/fixtures/action_task.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
-
id: 46
attempt: 3
runner_id: 1
status: 3 # 3 is the status code for "cancelled"
started: 1683636528
stopped: 1683636626
repo_id: 4
owner_id: 1
commit_sha: c2d72f548424103f01ee1dc02889c1e2bff816b0
is_fork_pull_request: 0
token_hash: 6d8ef48297195edcc8e22c70b3020eaa06c52976db67d39b4260c64a69a2cc1508825121b7b8394e48e00b1bf8718b2aaaaa
token_salt: eeeeeeee
token_last_eight: eeeeeeee
log_filename: artifact-test2/2f/47.log
log_in_storage: 1
log_length: 707
log_size: 90179
log_expired: 0
-
id: 47
job_id: 192
Expand Down
2 changes: 1 addition & 1 deletion models/fixtures/system_setting.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-
id: 1
setting_key: 'picture.disable_gravatar'
setting_value: 'false'
setting_value: 'true'
version: 1
created: 1653533198
updated: 1653533198
Expand Down
Loading

0 comments on commit 40de404

Please sign in to comment.