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

feat: Combine files in a multisource repo (#12471 #12485) #12508

Closed
wants to merge 64 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
d6b3094
Squashed all changes
gczuczy May 31, 2023
bc45d98
Merge branch 'master' into multi-source-combine-signedoff
gczuczy Jun 1, 2023
e4d510d
Removed conflicting file
gczuczy Jun 2, 2023
536a61e
Merged with master
gczuczy Jun 2, 2023
745138f
Merge branch 'master' into multi-source-combine-signedoff
gczuczy Jun 5, 2023
0f12068
Merge branch 'master' into multi-source-combine-signedoff
gczuczy Jun 6, 2023
85c565b
Merge branch 'master' into multi-source-combine-signedoff
gczuczy Jun 7, 2023
775ab16
mod-vendor-local rerun
gczuczy Jun 7, 2023
2a890d2
Overwrite destination files and force a hardrefresh
gczuczy Jun 7, 2023
a380375
Adjusted unit tests
gczuczy Jun 7, 2023
e99c0fe
Reverted forced hardrefresh
gczuczy Jun 7, 2023
25afe51
Merge branch 'master' into multi-source-combine-signedoff
gczuczy Jun 8, 2023
fbc25ab
Merge branch 'master' into multi-source-combine-signedoff
gczuczy Jun 9, 2023
565375b
Merge branch 'master' into multi-source-combine-signedoff
gczuczy Jun 12, 2023
7b0f750
Merge branch 'master' into multi-source-combine-signedoff
gczuczy Jun 14, 2023
488a8d2
Merge branch 'master' into multi-source-combine-signedoff
gczuczy Jun 16, 2023
4d446d7
Fix go.mod
gczuczy Jun 16, 2023
1aaabe6
Merge branch 'master' into multi-source-combine-signedoff
gczuczy Jun 16, 2023
d4d5ca0
Merge branch 'master' into multi-source-combine-signedoff
gczuczy Jun 19, 2023
8a0e846
mod-download-local
gczuczy Jun 19, 2023
0f74427
Merge branch 'master' into multi-source-combine-signedoff
gczuczy Jun 20, 2023
8de9607
Removed conflicting file
gczuczy Jun 23, 2023
7839f0a
Merge with master
gczuczy Jun 23, 2023
c7c20b3
codegen-local
gczuczy Jun 23, 2023
cff2c8c
removed conflicting file
gczuczy Jun 26, 2023
51a615d
Merge with master
gczuczy Jun 26, 2023
43b036e
codegen
gczuczy Jun 26, 2023
4757cfc
Merge branch 'master' into multi-source-combine-signedoff
gczuczy Jun 26, 2023
064bce5
Removed conflicting file
gczuczy Jun 28, 2023
1738156
Merge with master
gczuczy Jun 28, 2023
009fd9b
Merge branch 'master' into multi-source-combine-signedoff
gczuczy Jun 29, 2023
c382104
Merge branch 'master' into multi-source-combine-signedoff
gczuczy Jul 3, 2023
578d075
Merge branch 'master' into multi-source-combine-signedoff
gczuczy Jul 4, 2023
27e7ce0
Removed conflicting file
gczuczy Jul 10, 2023
612db26
Merge with master
gczuczy Jul 10, 2023
3019b38
Merge branch 'master' into multi-source-combine-signedoff
gczuczy Jul 11, 2023
e8dc655
Removed conflicting filespkg/apis/application/v1alpha1/generated.pb.go
gczuczy Jul 14, 2023
e63cabb
codegen-local
gczuczy Jul 14, 2023
2d54297
Merge branch 'master' into multi-source-combine-signedoff
gczuczy Jul 17, 2023
424e787
Merge branch 'master' into multi-source-combine-signedoff
gczuczy Jul 18, 2023
5b51c65
Merge branch 'master' into multi-source-combine-signedoff
gczuczy Jul 20, 2023
c1bc29e
Merge branch 'master' into multi-source-combine-signedoff
gczuczy Jul 24, 2023
656a7bd
Merge branch 'master' into multi-source-combine-signedoff
gczuczy Jul 31, 2023
aa969f8
Removed conflicting file
gczuczy Aug 7, 2023
66a66db
Merge with master
gczuczy Aug 7, 2023
1123dbf
Run lint
gczuczy Aug 7, 2023
281a66a
Merge branch 'master' into multi-source-combine-signedoff
gczuczy Aug 8, 2023
861c671
Removed conflicting file
gczuczy Aug 14, 2023
561692d
Regenerated files
gczuczy Aug 14, 2023
8e0c4e9
fmt fix
gczuczy Aug 14, 2023
f97908b
Removed conflicting file
gczuczy Aug 21, 2023
0a816ec
Regenerated files
gczuczy Aug 21, 2023
5f0d9d5
Merge branch 'master' into multi-source-combine-signedoff
gczuczy Sep 4, 2023
313d055
Removed conflicting file
gczuczy Sep 21, 2023
d439109
fix: Cache control 404 asset requests (#15327)
sentientmonkey Sep 5, 2023
9148d2e
codegen and lint
gczuczy Dec 11, 2023
ee83c8e
Merge with master
gczuczy Dec 11, 2023
75169d4
Merge branch 'master' into multi-source-combine-signedoff
gczuczy Dec 11, 2023
953d29e
Merge branch 'master' into multi-source-combine-signedoff
gczuczy Dec 19, 2023
07c5d50
Removed conflicting file
gczuczy Jan 8, 2024
1b8cb9f
Merge with master
gczuczy Jan 8, 2024
cce2d71
Removed conflicting files
gczuczy Mar 11, 2024
dfc9cb6
Merge with master
gczuczy Mar 11, 2024
acf443f
codegen and fix
gczuczy Mar 11, 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 branch 'master' into multi-source-combine-signedoff
gczuczy authored Jun 26, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 4757cfc90dde6336f92cf4e2c4d97116222980a4

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.