Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Fix conda null depend issue#35900

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
wxiaoguang merged 2 commits intogo-gitea:mainfromLuohaothu:main
Nov 8, 2025
Merged

Conversation

@Luohaothu
Copy link
Contributor

This fixes issue#35895

@GiteaBotGiteaBot added the lgtm/need 2This PR needs two approvals by maintainers to be considered for merging. labelNov 8, 2025
@github-actionsgithub-actionsbot added modifies/apiThis PR adds API routes or modifies them modifies/goPull requests that update Go code labelsNov 8, 2025
@GiteaBotGiteaBot added lgtm/need 1This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2This PR needs two approvals by maintainers to be considered for merging. labelsNov 8, 2025
@LuohaothuLuohaothu marked this pull request as ready for reviewNovember 8, 2025 14:13
@LuohaothuLuohaothu changed the titleWIP: Fix conda null depend issueFix conda null depend issueNov 8, 2025
Copy link
Member

@kemzebkemzeb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

LGTM

@GiteaBotGiteaBot added lgtm/doneThis PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1This PR needs approval from one additional maintainer to be merged. labelsNov 8, 2025
@wxiaoguangwxiaoguang merged commitbfaddbc intogo-gitea:mainNov 8, 2025
25 checks passed
@GiteaBotGiteaBot added this to the1.26.0 milestoneNov 8, 2025
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull requestNov 8, 2025
@GiteaBotGiteaBot added the backport/doneAll backports for this PR have been created labelNov 8, 2025
wxiaoguang pushed a commit that referenced this pull requestNov 8, 2025
Backport#35900 by LuohaothuThis fixes issue#35895Co-authored-by: Luohao Wang <luohaothu@live.com>
zjjhot added a commit to zjjhot/gitea that referenced this pull requestNov 10, 2025
* giteaofficial/main:  Allow to display embed images/pdfs when SERVE_DIRECT was enabled on MinIO storage (go-gitea#35882)  Add proper page title for project pages (go-gitea#35773)  Use correct form field for allowed force push users in branch protection API (go-gitea#35894)  Fix team member access check (go-gitea#35899)  Add ability for local makefile with personal customizations that wouldnt affect remote repo (go-gitea#35836)  Add toolchain directive to go.mod (go-gitea#35901)  Display source code downloads last for release attachments (go-gitea#35897)  Fix conda null depend issue (go-gitea#35900)  Fix avatar upload error handling (go-gitea#35887)  Move `gitea-vet` to use `go tool` (go-gitea#35878)  Contribution heatmap improvements (go-gitea#35876)  Update to go 1.25.4 (go-gitea#35877)
zjjhot added a commit to zjjhot/gitea that referenced this pull requestNov 24, 2025
* giteaofficial/release/v1.25: (77 commits)  Add "site admin" back to profile menu (go-gitea#36010) (go-gitea#36013)  release notes for 1.25.2 (go-gitea#35986)  Allow empty commit when merging pull request with squash style (go-gitea#35989) (go-gitea#36003)  Fix various permission & login related bugs (go-gitea#36002) (go-gitea#36004)  upgrade golang.org/x/crypto to 0.45.0 (go-gitea#35988)  Change project default column icon to 'star' (go-gitea#35967) (go-gitea#35979)  Misc CSS fixes (go-gitea#35888) (go-gitea#35981)  Fix container push tag overwriting (go-gitea#35936) (go-gitea#35954)  Fix corrupted external render content (go-gitea#35946) (go-gitea#35950)  Don't show unnecessary error message to end users for DeleteBranchAfterMerge (go-gitea#35937) (go-gitea#35941)  Limit read bytes instead of ReadAll (go-gitea#35928) (go-gitea#35934)  Load jQuery as early as possible to support custom scripts (go-gitea#35926) (go-gitea#35929)  Allow to display embed images/pdfs when SERVE_DIRECT was enabled on MinIO storage (go-gitea#35882) (go-gitea#35917)  Use correct form field for allowed force push users in branch protection API (go-gitea#35894) (go-gitea#35908)  Make OAuth2 issuer configurable (go-gitea#35915) (go-gitea#35916)Fixgo-gitea#35763: Add proper page title for project pages (go-gitea#35773) (go-gitea#35909)  Display source code downloads last for release attachments (go-gitea#35897) (go-gitea#35903)  Fix team member access check (go-gitea#35899) (go-gitea#35905)  Fix conda null depend issue (go-gitea#35900) (go-gitea#35902)  Fix avatar upload error handling (go-gitea#35887) (go-gitea#35890)  ...# Conflicts:#go.mod#go.sum#models/actions/run_test.go#models/fixtures/action_run.yml#models/fixtures/action_run_job.yml#models/fixtures/action_task.yml#models/fixtures/branch.yml#models/fixtures/repo_unit.yml#modules/git/tree_entry_gogit.go#modules/git/tree_gogit.go#routers/web/repo/actions/view.go#routers/web/repo/issue_comment.go#services/actions/workflow.go#services/doctor/actions_test.go#services/pull/comment.go#services/pull/pull.go#services/pull/temp_repo.go#templates/base/head_navbar.tmpl#templates/swagger/v1_json.tmpl#tests/integration/actions_schedule_test.go#tests/integration/git_lfs_ssh_test.go#tests/integration/pull_create_test.go#tests/integration/pull_merge_test.go#tests/sqlite.ini.tmpl#web_src/js/components/ContextPopup.vue
@xnoxxnox mentioned this pull requestDec 7, 2025
pimpale pushed a commit to hud-evals/gitea that referenced this pull requestDec 14, 2025
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment

Reviewers

@lafrikslafrikslafriks approved these changes

@wxiaoguangwxiaoguangwxiaoguang approved these changes

+1 more reviewer

@kemzebkemzebkemzeb approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

backport/doneAll backports for this PR have been createdbackport/v1.25lgtm/doneThis PR has enough approvals to get merged. There are no important open reservations anymore.modifies/apiThis PR adds API routes or modifies themmodifies/goPull requests that update Go codetype/bug

Projects

None yet

Milestone

1.26.0

Development

Successfully merging this pull request may close these issues.

5 participants

@Luohaothu@lafriks@wxiaoguang@kemzeb@GiteaBot

[8]ページ先頭

©2009-2025 Movatter.jp