Skip to content
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

Support for grouping RPMs using paths #26984

Merged
merged 50 commits into from
Jan 12, 2024
Merged
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
4ced55f
Remove extraneous code and prepare for commit
ExplodingDragon Sep 9, 2023
f3c4131
Change rpm help description
ExplodingDragon Sep 9, 2023
b7b593d
Merge branch 'main' into feature-support-multi-rpm-dist
ExplodingDragon Sep 9, 2023
895f419
Fix bugs and optimize queries
ExplodingDragon Sep 10, 2023
c04789e
Merge branch 'feature-support-multi-rpm-dist' of github.com:Exploding…
ExplodingDragon Sep 10, 2023
c718aad
Merge branch 'main' into feature-support-multi-rpm-dist
ExplodingDragon Sep 10, 2023
4d28c8d
Merge branch 'main' into feature-support-multi-rpm-dist
ExplodingDragon Sep 10, 2023
2adb75e
Merge branch 'main' into feature-support-multi-rpm-dist
ExplodingDragon Sep 11, 2023
e1e2575
Fix formatting
ExplodingDragon Sep 11, 2023
f12c8cc
Merge branch 'main' into feature-support-multi-rpm-dist
ExplodingDragon Sep 12, 2023
51596b6
Fix some problems
ExplodingDragon Sep 12, 2023
9c3cde6
Merge branch 'main' into feature-support-multi-rpm-dist
ExplodingDragon Sep 12, 2023
6fb18d3
fix tests
ExplodingDragon Sep 13, 2023
0d9cba5
Merge branch 'main' into feature-support-multi-rpm-dist
ExplodingDragon Sep 13, 2023
17693fb
Merge branch 'main' into feature-support-multi-rpm-dist
ExplodingDragon Sep 13, 2023
22211ee
Merge branch 'main' into feature-support-multi-rpm-dist
ExplodingDragon Sep 13, 2023
ad83ae0
Merge branch 'main' into feature-support-multi-rpm-dist
ExplodingDragon Sep 13, 2023
ac6a6e0
Merge branch 'main' into feature-support-multi-rpm-dist
ExplodingDragon Sep 14, 2023
109d077
Merge branch 'main' into feature-support-multi-rpm-dist
ExplodingDragon Sep 14, 2023
6682654
Merge branch 'main' into feature-support-multi-rpm-dist
ExplodingDragon Sep 14, 2023
a593edf
Merge branch 'main' of into feature-rpm-dist
ExplodingDragon Oct 28, 2023
b860b79
Merge branch 'main' of into feature-rpm-dist
ExplodingDragon Oct 28, 2023
ca647ee
compress filter
ExplodingDragon Oct 28, 2023
64c3a7e
rpm packages with arbitrary depth paths
ExplodingDragon Oct 28, 2023
561d86b
fix ui
ExplodingDragon Oct 28, 2023
7957d60
fix migrations
ExplodingDragon Oct 28, 2023
2e2cd0f
i10n clean
ExplodingDragon Oct 28, 2023
a8fff90
move varfunc
ExplodingDragon Oct 28, 2023
1887c93
fix docs
ExplodingDragon Oct 28, 2023
a4fc3ed
Merge branch 'main' into feature-support-multi-rpm-dist
ExplodingDragon Oct 29, 2023
a66f80b
fixed bugs
ExplodingDragon Oct 29, 2023
5519c17
Merge branch 'main' into feature-support-multi-rpm-dist
ExplodingDragon Oct 30, 2023
83a4b18
add group by version
ExplodingDragon Oct 30, 2023
5f6ebb5
add group by version
ExplodingDragon Oct 30, 2023
d8ede80
fix nogroup upload
ExplodingDragon Oct 30, 2023
2ea6ca3
Merge branch 'main' into feature-support-multi-rpm-dist
ExplodingDragon Oct 30, 2023
1b4e2ce
style clean
ExplodingDragon Oct 30, 2023
f66f1b9
remove db merge
ExplodingDragon Oct 30, 2023
85c54fe
remove db merge
ExplodingDragon Oct 30, 2023
56350e4
Merge branch 'main' into feature-support-multi-rpm-dist
ExplodingDragon Oct 30, 2023
884adb4
Merge branch 'main' into feature-support-multi-rpm-dist
ExplodingDragon Nov 1, 2023
695b2d2
Merge branch 'main' into feature-support-multi-rpm-dist
ExplodingDragon Nov 9, 2023
3a27fe3
Merge branch 'main' into feature-support-multi-rpm-dist
ExplodingDragon Nov 14, 2023
0369dc4
Merge branch 'main' into feature-support-multi-rpm-dist
ExplodingDragon Nov 23, 2023
3cf416d
merge #28309
ExplodingDragon Dec 5, 2023
d69539c
merge #28309
ExplodingDragon Dec 5, 2023
7926b48
Merge branch 'main' into feature-support-multi-rpm-dist
ExplodingDragon Jan 8, 2024
5bb1193
fix rpm unit test
ExplodingDragon Jan 8, 2024
4ce3226
Merge branch 'main' into feature-support-multi-rpm-dist
ExplodingDragon Jan 10, 2024
3611059
Merge branch 'main' into feature-support-multi-rpm-dist
GiteaBot Jan 12, 2024
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
Prev Previous commit
Next Next commit
merge #28309
ExplodingDragon committed Dec 5, 2023

Verified

This commit was signed with the committer’s verified signature.
ExplodingDragon Exploding Dragon
commit 3cf416d20166142cfb960d4964849bb34b66b58b
7 changes: 6 additions & 1 deletion routers/api/packages/api.go
Original file line number Diff line number Diff line change
@@ -589,6 +589,7 @@ func RpmRoutes(r *web.Route) func() {
return func() {
r.Methods("HEAD,GET,POST,PUT,PATCH,DELETE", "*", func(ctx *context.Context) {
path := ctx.Params("*")
isHead := ctx.Req.Method == "HEAD"
isGetHead := ctx.Req.Method == "HEAD" || ctx.Req.Method == "GET"
isPut := ctx.Req.Method == "PUT"
isDelete := ctx.Req.Method == "DELETE"
@@ -610,7 +611,11 @@ func RpmRoutes(r *web.Route) func() {
if len(m) == 3 && isGetHead {
ctx.SetParams("group", strings.Trim(m[1], "/"))
ctx.SetParams("filename", m[2])
rpm.GetRepositoryFile(ctx)
if isHead {
rpm.CheckRepositoryFileExistence(ctx)
} else {
rpm.GetRepositoryFile(ctx)
}
return
}
// upload
You are viewing a condensed version of this merge commit. You can view the full changes here.