67 Commits

Author SHA1 Message Date
Marko Gaćeša
f365ba6713 fix: [CODE-3272]: revert delete of source branch in merge git call (#3542)
* revert delete of source branch in merge git call
2025-03-12 14:48:32 +00:00
Darko Draskovic
cad0fbdf98 feat: [CODE-3256]: Add merge verify rule info related to minimum required approvals count for default reviewers (#3483)
* Merge remote-tracking branch 'origin/main' into dd/merge-verify-rules
* Replace princiapl ids with infos in merge verify response
* Populate DefaultReviewerApprovalsResponse with principal ids and current count
* Add MergeVerifyRulesResponse type
2025-02-26 17:56:59 +00:00
Darko Draskovic
df7ac77361 feat: [CODE-3233]: Automatically add default reviewers based on rules (#3464)
* Fix tests
* Amend on protection rules verify to include the entire rule output data
* Merge remote-tracking branch 'origin/main' into dd/rule-reviewers
* Fix protection.Branch init in mapToBranchRules
* Amend MergeVerify to include number of default reviewer approvals
* Merge remote-tracking branch 'origin/main' into dd/rule-reviewers
* Refactor add code owners as reviewers to include add default reviewers
* Automatically add default reviewers based on rules
2025-02-25 15:52:59 +00:00
Marko Gaćeša
53142b18a8 techdebt: [CODE-3218]: use context.WithoutCancel in contextutil (#3457) 2025-02-20 19:20:48 +00:00
Marko Gaćeša
a906259562 feat: [CODE-3148]: refactor refcache (#3390)
* linter issues fix
* reintroduce repofinder to aiagent
* Merge remote-tracking branch 'origin/main' into mg/cache/space-and-repo-finder
* removed refcache deps from aiagent
* pr comments
* fix linter issues
* refactor refcache
2025-02-12 12:42:12 +00:00
Marko Gaćeša
530a707052 feat: [CODE-3076]: update several refs on merge (#3355)
* resolve pr comments
* update several refs on merge
2025-02-03 10:52:01 +00:00
Darko Draskovic
265eb40f22 feat: [CODE-1353]: Add status check and merge check SSE events (#3146)
* Merge remote-tracking branch 'origin/main' into dd/sse-events
* Add webhook create/update/delete event
* Add branch/tag created/updated deleted events
* Merge remote-tracking branch 'origin/main' into dd/sse-events
* Merge remote-tracking branch 'origin/main' into dd/sse-events
* Merge remote-tracking branch 'origin/main' into dd/sse-events
* Add new event types
* Merge remote-tracking branch 'origin/main' into dd/sse-events
* Add logs directly to publisher
* Merge remote-tracking branch 'origin/main' into dd/sse-events
* Add status check and merge check SSE events
2024-12-18 16:00:58 +00:00
Marko Gaćeša
35b7745b65 fix: [CODE-2583]: fix merge dry_run with no method; add dry_run_rules to merge (#2862)
* default to "merge" method for dry-run of merge
* fix merge dry_run with no method; add dry_run_rules to merge
2024-10-25 11:16:37 +00:00
Marko Gaćeša
8c5e7546c3 feat: [CODE-2567]: improve git commit message handling (#2849)
* make the change backward compatible
* improve git commit message handling
2024-10-24 10:08:36 +00:00
Johannes Batzill
7b5490ac10 fix: [CODE-2583]: fix dry-running merge without merge method (#2852)
* fix: [CODE-2583]: fix dry-running merge without merge method
2024-10-22 23:06:12 +00:00
Marko Gaćeša
069a35a4d8 feat: [CODE-2484]: add API to squash commits on a branch (#2793)
* add openapi entry for squash
* minor fixes
* squash api
2024-10-15 16:49:02 +00:00
Akhilesh Pandey
3ef7f9f55a feat: [CODE-2312]: Update UI labels for audit service (#2805)
* feat: [CODE-2312]: revert go-sdk changes in all places
* feat: [CODE-2312]: revert go.mod changes
* feat: [CODE-2312]: fresh reset
* feat: [CODE-2312]: go.mod changes
* feat: [CODE-2312]: address resourcename to commit.go
* Merge branch 'main' into akp/CODE-2312
* feat: [CODE-2312]: address resourcename to commit.go
* feat: [CODE-2312]: address resourcename to commit.go
* feat: [CODE-2312]: address failure due to exceeding limit on resource labels
* feat: [CODE-2312]: lint
* feat: [CODE-2312]: MERGE
* feat: [CODE-2312]: Update wire
* feat: [CODE-2312]: update ui labels
* feat: [CODE-2312]: update resource and action
* feat: [CODE-2312]: Audit log new action : bypassed
* feat: [CODE-2312]: audit log object update
* Merge branch 'main' into akp/CODE-2312
* feat: [CODE-2312]: audit logging changes for commit, merge, create and delete branch
* Merge branch 'main' into akp/CODE-2312
* Merge branch 'main' into akp/CODE-2312
* feat: [CODE-2312]: introduce parser and enclosing method
* feat: [CODE-2312]: annotate error
* feat: [CODE-2312]: name change and todo removal
* feat: [CODE-2312]: Annotate errors
* feat: [CODE-2232]: Branch Rules: UserGroup support: Create and List
2024-10-11 17:05:19 +00:00
Akhilesh Pandey
e3b3e983fd feat: [CODE-2312]: audit logging changes for commit, merge, create and delete branch (#2686)
* feat: [CODE-2312]: address resourcename to commit.go
* feat: [CODE-2312]: address failure due to exceeding limit on resource labels
* feat: [CODE-2312]: lint
* feat: [CODE-2312]: MERGE
* feat: [CODE-2312]: Update wire
* feat: [CODE-2312]: update ui labels
* feat: [CODE-2312]: update resource and action
* feat: [CODE-2312]: Audit log new action : bypassed
* feat: [CODE-2312]: audit log object update
* Merge branch 'main' into akp/CODE-2312
* feat: [CODE-2312]: audit logging changes for commit, merge, create and delete branch
* Merge branch 'main' into akp/CODE-2312
* Merge branch 'main' into akp/CODE-2312
* feat: [CODE-2312]: introduce parser and enclosing method
* feat: [CODE-2312]: annotate error
* feat: [CODE-2312]: name change and todo removal
* feat: [CODE-2312]: Annotate errors
* feat: [CODE-2232]: Branch Rules: UserGroup support: Create and List
2024-10-08 16:20:56 +00:00
Marko Gaćeša
2892378036 feat: [CODE-1474]: add check PR rebaseability (#2763)
* update migration number
* rename UpdateConflict->UpdateMergeOutcome
* small fixes
* handle mergeability for all merge methods
* alway separate rebaseability check
* add check PR rebaseability
2024-10-04 12:36:32 +00:00
Marko Gaćeša
8dac8c2797 feat: [CODE-2335]: add dryrun option for rebase API (#2721)
* dryrun rebase
2024-09-23 14:46:17 +00:00
Marko Gaćeša
7c83c5520e feat: [CODE-2385]: add fast-forward merge (#2718)
* add fast-forward merge
2024-09-23 11:34:19 +00:00
Karan Saraswat
93b642b2ba feat: [CODE-2359]: PR source branch delete/restore API (#2690)
* passed 409 for open PRs for restore branch API
* addressed review comments
* fixed lint issue
* feat: [CODE-2359]: PR source branch delete/restore API
2024-09-18 12:17:21 +00:00
Marko Gaćeša
1e644163d3 deprecate PR edited field (#2692)
* deprecate PR edited field
2024-09-16 15:44:17 +00:00
Akhilesh Pandey
a2cea52155 feat: [CODE-2232]: Branch Rules: UserGroup support: Create and List (#2640)
* feat: [CODE-2327]: add usergroup change to rebase api
* Merge branch 'main' into akp/CODE-2327
* feat: [CODE-2327]: wrap error
* feat: [CODE-2327]: move resolver inside bypass.go and update tests
* feat: [CODE-2327]: newline
* feat: [CODE-2327]: update wire
* Merge remote-tracking branch 'origin' into akp/CODE-2327
* feat: [CODE-2327]: update tests
* feat: [CODE-2327]: fix build
* feat: [CODE-2327]: merge main
* feat: [CODE-2327]: add and update unit tests
* feat: [CODE-2327]: fix
* feat: [CODE-2312]: introduce parser and enclosing method
* Apply suggestion from code review
* feat: [CODE-2327]: annotate error
* Merge branch 'main' into akp/CODE-2327
* feat: [CODE-2327]: usergroup resolver via controller
* feat: [CODE-2312]: update interface in protection
* feat: [CODE-2312]: export and update deduplication use
* feat: [CODE-2327]: Branch Rules: Allow Group bypass.go
* feat: [CODE-2232]: Branch Rules: UserGroup support: Create and List
2024-09-11 08:04:31 +00:00
Johannes Batzill
77b01718bd feat: [CODE-2179]: Add error message to protection rule violation error responses (#2665) 2024-09-06 18:54:15 +00:00
Marko Gaćeša
ccf267f1cc update pull request edited field after successful merge (#2625)
* update pull request edited field after successful merge
2024-09-02 08:59:50 +00:00
Marko Gaćeša
6b12b45950 add log entries for rejected merges (#2604)
* add log entries for rejected merges
2024-08-28 12:51:42 +00:00
Karan Saraswat
55d2b1dee3 feat: [CODE-2297]: add dry run param for delete branch API (#2590)
* Merge branch 'main' of https://git0.harness.io/l7B_kbSEQD2wjrM7PShm5w/PROD/Harness_Commons/gitness into CODE-2297
* updated comment
* worked on review comments and added to openapi spec
* return empty violations array when dry_run = true
* feat: [CODE-2297]: add dry run param for delete branch API
2024-08-28 08:39:04 +00:00
Enver Biševac
6d0db9512e feat: instrumentation, intitial work (#2475)
* requested changes
* requested changes
* feat: instrumentation, intitial work
2024-08-18 22:04:34 +00:00
Marko Gaćeša
d687080cf4 pr reviewer removal (#2269)
* add reviewer principal ID to activity payload
* pr reviewer removal
2024-07-25 09:55:41 +00:00
Marko Gaćeša
4ac42fc6c9 Add additions and deletions to PRs (#2196) 2024-07-11 10:01:17 +00:00
Johannes Batzill
38553bca7b Lock pr number for dryrun instead of across whole repo (#2038) 2024-05-20 18:45:09 +00:00
Johannes Batzill
86537b2c39 Fix merge related issues (#2012) 2024-04-25 22:00:53 +00:00
Johannes Batzill
a690fa4ebc small fixes (#1232) 2024-04-19 01:36:03 +00:00
Johannes Batzill
c5383940bd Integrate approvals.RequireLatestcommit to merge dryrun (#1183) 2024-04-04 22:39:23 +00:00
Atefeh Mohseni-Ejiyeh
b64f4c41fa Update default branch on empty repo for first commit (#1122) 2024-04-04 01:16:43 +00:00
Enver Bisevac
cecfecdb06 [code-1016] Replace gitea Usages (not wrapper) (#1063) 2024-03-26 20:31:30 +00:00
Johannes Batzill
fd2f3c1e38 [MISC] Add customized commit message support to PR (#1126) 2024-03-21 06:41:12 +00:00
Johannes Batzill
dc7b3bc79a [Rules] Expose extra Branch.PullReq fields on merge DryRyn as required by UI (#1117) 2024-03-13 23:37:10 +00:00
Marko Gacesa
e3bf017f78 Rewrite of git merge (#1023) 2024-02-07 09:40:04 +00:00
Johannes Batzill
adf2046a94 [MISC] Move UID to Identifier to match Harness Standards (#992) 2024-01-29 23:29:53 +00:00
Johannes Batzill
a892dda829 [CODE-1287] Improve PR Merge for canceled Request (#963) 2024-01-12 20:25:16 +00:00
Johannes Batzill
e6f67bb6dd [CODEOWNERS] Fix NotFound Error Translation (#909) 2023-12-14 07:44:40 +00:00
Johannes Batzill
2f64331707 [Pullreq] Allow DryRun for Draft PR (#857) 2023-12-01 17:27:56 +00:00
Johannes Batzill
d85ed52bc5 [Pullreq] Merge using PR Author Identity (#846) 2023-12-01 03:58:45 +00:00
Johannes Batzill
99c27f8fac [Pullreq] Send SSE on Merge DryRun (#850) 2023-12-01 00:54:39 +00:00
Marko Gacesa
598599bf20 make failed dryrun DB update noncritical (#841) 2023-11-30 19:43:47 +00:00
Marko Gacesa
03b33aca77 store PR commit count in the DB (#842) 2023-11-30 15:01:18 +00:00
Marko Gacesa
1d06026d05 handle merge conflict not as an error (#823) 2023-11-28 11:14:51 +00:00
Marko Gacesa
3d97474dcf feat: [CODE-1132]: dryrun requires view permission (#819) 2023-11-22 22:38:44 +00:00
Enver Bisevac
67f560874d [maint] gitrpc package removed (#726) 2023-11-15 10:15:32 +00:00
Johannes Batzill
e6bba2e0ce [BugBash] Fix PR Activities, Increase merge lock timeout (#783) 2023-11-09 20:04:36 +00:00
Marko Gacesa
98dc67fc71 return allowed merge methods for merge dry run (#781) 2023-11-08 18:55:25 +00:00
Marko Gacesa
e731c0fdff require latest source sha as param for the merge API (#767) 2023-11-06 12:16:18 +00:00
Marko Gacesa
941bc7a0fd allow optional rule bypass (#764) 2023-11-03 18:31:10 +00:00