Commit Graph

49 Commits (a2cea521550de910909f69b9d4d72f1b507579b3)

Author SHA1 Message Date
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
Marko Gacesa db7655c569 return 422 in case of merge conflicts (#724) 2023-11-03 17:14:36 +00:00
Marko Gacesa 3a7617a2e6 add dry_run option to the merge API (#737) 2023-11-01 19:57:28 +00:00
Johannes Batzill b0e519b571 [WIP] Move from `space_owner` to `repo_admin` for protection rules (#745) 2023-10-30 22:35:52 +00:00
Abhinav Singh e0df722ce3 feat: add codeowner validate api (#733) 2023-10-30 22:16:39 +00:00
Marko Gacesa 1a727b8be1 refactor of protection package (#734) 2023-10-27 14:06:09 +00:00
Abhinav Singh d92564258b fix: empty codeowner gives issue in merge check (#730) 2023-10-26 22:22:59 +00:00
Marko Gacesa 059e9760c8 require push permission for PR merge (#725) 2023-10-26 17:34:28 +00:00
Abhinav Singh adbe2f6f97 feat: [CODE-967]: codeowners service e2e (#695) 2023-10-26 16:50:59 +00:00
Marko Gacesa 6ee49f9848 API returns status 422 in case of rule violations (#718) 2023-10-26 08:35:42 +00:00
Marko Gacesa 7ab52c1764 add protection to prevent direct push (#712) 2023-10-24 14:22:06 +00:00
Marko Gacesa 8d82daf876 merge API: return if the branch is deleted (#701) 2023-10-20 11:27:51 +00:00
Marko Gacesa fcc8c0be73 use dedicated DB query to fetch all repo rules (#702) 2023-10-20 11:06:33 +00:00
Hitesh Aringa a0b1c7a654 [Branch Protection] Ignore membership not found error for protection rule in merge (#705) 2023-10-19 19:58:12 +00:00
Marko Gacesa 7bbeca2750 status checks: use DB-layer list status checks results func (#692) 2023-10-19 05:43:36 +00:00
Marko Gacesa 6139a0bbb2 rule to autodelete the branch after PR merge (#681) 2023-10-17 11:09:09 +00:00
Marko Gacesa 419fe92dde add branch protection: DB and API layer (#671) 2023-10-16 11:33:00 +00:00
Johannes Batzill a8cb5dc8d2 remove internal package and move to app - might be refactored more in the coming weeks 2023-09-26 11:25:15 -07:00