15 Commits

Author SHA1 Message Date
Johannes Batzill
a83cd21c17 [OPEN-SOURCE] Prepare Repository (#605) 2023-09-24 07:33:16 +00:00
Enver Bisevac
73486d5e71 errors are properly returned from diff-stats and merge-check api 2023-08-17 17:00:39 +02:00
Johannes Batzill
63c45cb0db [GITHA] Prepare GITRPC for GITHA changes (HTTP Server, GRPC Operations: Sync, RemoteDefaultBranch, Deterministic CommitID) (#153) 2023-06-22 16:54:18 +00:00
Enver Bisevac
331221a2ef Merge branch 'eb/code-280' of _OKE5H2PQKOUfzFFDuD4FA/default/CODE/gitness (#99) 2023-05-26 15:47:20 +00:00
Enver Bisevac
8ab5185263 fixed linter issues 2023-05-17 21:56:23 +02:00
Enver Bisevac
0d1fd8d9c5 return bad request if head and base branch have same commit sha 2023-05-17 17:05:11 +02:00
Enver Bisevac
25a0f31df6 rebase and merge implementation 2023-05-15 18:12:55 +02:00
Enver Bisevac
74c3c856a8 squash merge option added 2023-05-12 14:33:02 +02:00
Johannes Batzill
9d894c79cc [MERGE] Enhance PR Merge (Check) Fields. (#342) 2023-02-14 20:18:10 -08:00
Enver Bisevac
13a456e357 [scm-58] Add merge-check and Integrate with PR (#318)
Co-authored-by: Johannes Batzill <johannes.batzill@harness.io>
2023-02-11 23:22:12 -08:00
Enver Bisevac
6a7cc4e518 [scm-63] fix for empty commits and diff in PR (#228) 2023-01-20 02:27:51 +01:00
Johannes Batzill
c827fa5e66 [MISC] Webhook Creation Default To Secure, Fix PR/Compare Commit Listing, Fix Merge Commit Message (#203)
This change is fixing a few things on both UI and backend side:
- update webhook creation screen to default to enable ssl verification (secure by default should always be the move)
- fix pr/compare commit listing to show correct diffs the head branch is ahead of the base branch (NOTE: THIS ONLY SHOWS THE LATEST 20 COMMITS - NO PAGINATION ADDED)
- fix merge commit message to contain the correct head branch, source repo path and pr numbers (similar'ish to github)
2023-01-13 02:49:39 -08:00
Enver Bisevac
2c62dda460 [maint] added ReadTree method to git adapter (#174)
* added ReadTree method in git adapter

* minor fix and rebase to main
2023-01-11 00:32:51 +01:00
Enver Bisevac
2f5339ece5 merge operation refactored (#172) 2023-01-10 13:54:08 +01:00
Enver Bisevac
63de576d08 [feat] initial work on merging PR (#170)
* initial work on merging PR

* code refactored based on requested changes

* requested changes
2023-01-10 02:09:43 +01:00