github-starred/ollama
2
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2026-05-06 16:11:34 -05:00
Code Issues 14.5k Packages Projects Releases 120 Wiki Activity

[PR #4278] [CLOSED] merge code #37308

New Issue
Closed
opened 2026-04-22 22:01:28 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-22 22:01:28 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/4278
Author: @uppercaveman
Created: 5/9/2024
Status: ❌ Closed

Base: main ← Head: main

📝 Commits (10+)

📊 Changes

83 files changed (+215 additions, -1485 deletions)

View changed files

➖ .github/ISSUE_TEMPLATE/10_bug_report.yml (+0 -60)
➖ .github/ISSUE_TEMPLATE/20_feature_request.md (+0 -6)
➖ .github/ISSUE_TEMPLATE/30_model_request.md (+0 -5)
➖ .github/ISSUE_TEMPLATE/config.yml (+0 -8)
➖ .github/workflows/latest.yaml (+0 -24)
➖ .github/workflows/release.yaml (+0 -473)
➖ .github/workflows/test.yaml (+0 -319)
📝 .gitignore (+3 -2)
📝 Dockerfile (+27 -27)
📝 LICENSE (+1 -1)
📝 README.md (+7 -382)
📝 api/client.go (+3 -3)
📝 app/lifecycle/lifecycle.go (+2 -2)
📝 app/lifecycle/server.go (+1 -1)
📝 app/lifecycle/updater.go (+2 -2)
📝 app/main.go (+1 -1)
📝 app/tray/tray.go (+2 -2)
📝 app/tray/tray_nonwindows.go (+1 -1)
📝 app/tray/tray_windows.go (+2 -2)
📝 app/tray/wintray/tray.go (+1 -1)

...and 63 more files

📄 Description

No description provided

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/ollama/ollama/pull/4278 **Author:** [@uppercaveman](https://github.com/uppercaveman) **Created:** 5/9/2024 **Status:** ❌ Closed **Base:** `main` ← **Head:** `main` --- ### 📝 Commits (10+) - [`6188b5d`](https://github.com/ollama/ollama/commit/6188b5da44bf443fcddcccb5b51a5dfac9ce2697) adjusting project structure - [`9fc80bc`](https://github.com/ollama/ollama/commit/9fc80bceface4845bb754a052a84c63fcbca87da) project theme - [`5332464`](https://github.com/ollama/ollama/commit/533246443f2c2d488cbe8503e58b62b27378adda) fix conflict - [`dfdc6c7`](https://github.com/ollama/ollama/commit/dfdc6c75351c99c7d4faf4dc1a2febf03589de0d) Merge branch 'ollama-main' - [`b8500eb`](https://github.com/ollama/ollama/commit/b8500eb337fa29bde3168137862849e3af19a093) delete workflows - [`7194a01`](https://github.com/ollama/ollama/commit/7194a01b9f8e91f432b0fdfe55f47b9b0e0d2882) Merge pull request #2 from ollama/main - [`7d627ec`](https://github.com/ollama/ollama/commit/7d627ecc76652afeeb690b8014ef2df2ee730cbe) fix bug - [`8127925`](https://github.com/ollama/ollama/commit/8127925f188a189dcef3e43ee810dabcd3a6bf3b) Update README.md - [`bda93c8`](https://github.com/ollama/ollama/commit/bda93c8b855a9e6772fb146688777614a7ccc899) Merge pull request #3 from uppercaveman/uppercaveman-patch-1 - [`ec55d99`](https://github.com/ollama/ollama/commit/ec55d99afd49ee671637fdc8a61fb12fef9db094) restructuring ### 📊 Changes **83 files changed** (+215 additions, -1485 deletions) <details> <summary>View changed files</summary> ➖ `.github/ISSUE_TEMPLATE/10_bug_report.yml` (+0 -60) ➖ `.github/ISSUE_TEMPLATE/20_feature_request.md` (+0 -6) ➖ `.github/ISSUE_TEMPLATE/30_model_request.md` (+0 -5) ➖ `.github/ISSUE_TEMPLATE/config.yml` (+0 -8) ➖ `.github/workflows/latest.yaml` (+0 -24) ➖ `.github/workflows/release.yaml` (+0 -473) ➖ `.github/workflows/test.yaml` (+0 -319) 📝 `.gitignore` (+3 -2) 📝 `Dockerfile` (+27 -27) 📝 `LICENSE` (+1 -1) 📝 `README.md` (+7 -382) 📝 `api/client.go` (+3 -3) 📝 `app/lifecycle/lifecycle.go` (+2 -2) 📝 `app/lifecycle/server.go` (+1 -1) 📝 `app/lifecycle/updater.go` (+2 -2) 📝 `app/main.go` (+1 -1) 📝 `app/tray/tray.go` (+2 -2) 📝 `app/tray/tray_nonwindows.go` (+1 -1) 📝 `app/tray/tray_windows.go` (+2 -2) 📝 `app/tray/wintray/tray.go` (+1 -1) _...and 63 more files_ </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-04-22 22:01:28 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
amd
api
app
bug
build
cli
cloud
compatibility
context-length
create
docker
documentation
embeddings
feature request
feedback wanted
good first issue
gpt-oss
gpu
harmony
help wanted
image
install
intel
js
launch
linux
macos
memory
mlx
model
needs more info
networking
nvidia
ollama.com
performance
pull-request
Mirrored from GitHub Pull Request
 python
question
registry
rendering
thinking
tools
top
vulkan
windows
wsl
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/ollama#37308
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?