Commit Graph

40 Commits (86537b2c390f6ac1dea6bc6919948469fc300967)

Author SHA1 Message Date
Johannes Batzill 86537b2c39 Fix merge related issues () 2024-04-25 22:00:53 +00:00
Johannes Batzill a690fa4ebc small fixes () 2024-04-19 01:36:03 +00:00
Johannes Batzill c5383940bd Integrate approvals.RequireLatestcommit to merge dryrun () 2024-04-04 22:39:23 +00:00
Atefeh Mohseni-Ejiyeh b64f4c41fa Update default branch on empty repo for first commit () 2024-04-04 01:16:43 +00:00
Enver Bisevac cecfecdb06 [code-1016] Replace `gitea` Usages (not wrapper) () 2024-03-26 20:31:30 +00:00
Johannes Batzill fd2f3c1e38 [MISC] Add customized commit message support to PR () 2024-03-21 06:41:12 +00:00
Johannes Batzill dc7b3bc79a [Rules] Expose extra `Branch.PullReq` fields on merge DryRyn as required by UI () 2024-03-13 23:37:10 +00:00
Marko Gacesa e3bf017f78 Rewrite of git merge () 2024-02-07 09:40:04 +00:00
Johannes Batzill adf2046a94 [MISC] Move `UID` to `Identifier` to match Harness Standards () 2024-01-29 23:29:53 +00:00
Johannes Batzill a892dda829 [CODE-1287] Improve PR Merge for canceled Request () 2024-01-12 20:25:16 +00:00
Johannes Batzill e6f67bb6dd [CODEOWNERS] Fix NotFound Error Translation () 2023-12-14 07:44:40 +00:00
Johannes Batzill 2f64331707 [Pullreq] Allow DryRun for Draft PR () 2023-12-01 17:27:56 +00:00
Johannes Batzill d85ed52bc5 [Pullreq] Merge using PR Author Identity () 2023-12-01 03:58:45 +00:00
Johannes Batzill 99c27f8fac [Pullreq] Send SSE on Merge DryRun () 2023-12-01 00:54:39 +00:00
Marko Gacesa 598599bf20 make failed dryrun DB update noncritical () 2023-11-30 19:43:47 +00:00
Marko Gacesa 03b33aca77 store PR commit count in the DB () 2023-11-30 15:01:18 +00:00
Marko Gacesa 1d06026d05 handle merge conflict not as an error () 2023-11-28 11:14:51 +00:00
Marko Gacesa 3d97474dcf feat: [CODE-1132]: dryrun requires view permission () 2023-11-22 22:38:44 +00:00
Enver Bisevac 67f560874d [maint] gitrpc package removed () 2023-11-15 10:15:32 +00:00
Johannes Batzill e6bba2e0ce [BugBash] Fix PR Activities, Increase merge lock timeout () 2023-11-09 20:04:36 +00:00
Marko Gacesa 98dc67fc71 return allowed merge methods for merge dry run () 2023-11-08 18:55:25 +00:00
Marko Gacesa e731c0fdff require latest source sha as param for the merge API () 2023-11-06 12:16:18 +00:00
Marko Gacesa 941bc7a0fd allow optional rule bypass () 2023-11-03 18:31:10 +00:00
Marko Gacesa db7655c569 return 422 in case of merge conflicts () 2023-11-03 17:14:36 +00:00
Marko Gacesa 3a7617a2e6 add dry_run option to the merge API () 2023-11-01 19:57:28 +00:00
Johannes Batzill b0e519b571 [WIP] Move from `space_owner` to `repo_admin` for protection rules () 2023-10-30 22:35:52 +00:00
Abhinav Singh e0df722ce3 feat: add codeowner validate api () 2023-10-30 22:16:39 +00:00
Marko Gacesa 1a727b8be1 refactor of protection package () 2023-10-27 14:06:09 +00:00
Abhinav Singh d92564258b fix: empty codeowner gives issue in merge check () 2023-10-26 22:22:59 +00:00
Marko Gacesa 059e9760c8 require push permission for PR merge () 2023-10-26 17:34:28 +00:00
Abhinav Singh adbe2f6f97 feat: [CODE-967]: codeowners service e2e () 2023-10-26 16:50:59 +00:00
Marko Gacesa 6ee49f9848 API returns status 422 in case of rule violations () 2023-10-26 08:35:42 +00:00
Marko Gacesa 7ab52c1764 add protection to prevent direct push () 2023-10-24 14:22:06 +00:00
Marko Gacesa 8d82daf876 merge API: return if the branch is deleted () 2023-10-20 11:27:51 +00:00
Marko Gacesa fcc8c0be73 use dedicated DB query to fetch all repo rules () 2023-10-20 11:06:33 +00:00
Hitesh Aringa a0b1c7a654 [Branch Protection] Ignore membership not found error for protection rule in merge () 2023-10-19 19:58:12 +00:00
Marko Gacesa 7bbeca2750 status checks: use DB-layer list status checks results func () 2023-10-19 05:43:36 +00:00
Marko Gacesa 6139a0bbb2 rule to autodelete the branch after PR merge () 2023-10-17 11:09:09 +00:00
Marko Gacesa 419fe92dde add branch protection: DB and API layer () 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