Commit Graph

26 Commits

Author SHA1 Message Date
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
8ab5185263 fixed linter issues 2023-05-17 21:56:23 +02:00
Enver Bisevac
7edc3d087b sqaush and merge message same as PR title 2023-05-17 16:05:43 +02:00
Enver Bisevac
d865f08eb0 Merge branch 'eb/code-174-fix' of _OKE5H2PQKOUfzFFDuD4FA/default/CODE/gitness (#69) 2023-05-12 17:12:03 +00:00
Enver Bisevac
3889cb891f use enum from types 2023-05-12 19:01:29 +02:00
Enver Bisevac
4c4035d1e3 Merge branch 'eb/code-174' of _OKE5H2PQKOUfzFFDuD4FA/default/CODE/gitness (#63) 2023-05-12 15:57:52 +00:00
Enver Bisevac
74c3c856a8 squash merge option added 2023-05-12 14:33:02 +02:00
Marko Gaćeša
2cfe58c699 block merge if there are unresolved comments 2023-05-12 13:53:29 +02:00
Marko Gaćeša
be3b68e577 make merge base SHA not nullable 2023-04-27 13:12:54 +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
Marko Gaćeša
ce322ec596 Writing pull req activities in controllers (#263) 2023-01-31 12:34:18 +01:00
Marko Gaćeša
4277c4c66b Simplify handling of PR events (#253) 2023-01-27 16:27:03 -08:00
Enver Bisevac
1f86b3c73d [fix] merge commit is blocked with dbtx mutex lock (#245) 2023-01-26 13:41:45 +01:00
Marko Gaćeša
825336d0e4 Added missing context in some of the log calls (#250) 2023-01-25 14:06:48 +01:00
Marko Gaćeša
7a92d8e110 PR events and PR head ref (#244) 2023-01-25 11:19:58 +01:00
Johannes Batzill
085e63422b [MISC] Explicitly type PullReqActivity.Payload (#233) 2023-01-20 12:29:13 -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
95a77e072e [MISC] Fix badrequest error in merge API (#231) 2023-01-18 18:17:18 -08:00
Johannes Batzill
335998505e [MISC] Introduce PathStore and Move PathLogic to Controller Layer (#226)
This change is a follow up on the effort to remove transactions and sync stores from the database layer, and move them in the application layer. It is addressing the repo + space store.
The following changes are included:
- Introduce PathStore storing resource paths (repo + space)
- Add foreign key from path.repo_id/space_id to repo.id/space.id
- Add foreign key from repo/space.parent_id to space.id
- Remove repo_sync and space_sync
- Move path creation logic to repo/space controller (for both creating primary paths for new repos/spaces, as well as creating alias spaces)
- Reimplement repo/space moving on controller layer
2023-01-18 11:34:12 -08:00
Marko Gaćeša
8151b4591e PR change state API; Removed rejected state (#220) 2023-01-17 16:04:30 +01:00
Marko Gaćeša
e5dc9754cd default list of PR states should be empty (#210) 2023-01-13 18:47:42 -08:00
Marko Gaćeša
bacda596fa Added Correct method for enum types (#194) 2023-01-13 13:59:53 +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
Marko Gaćeša
8909037ec7 enum types should have Enum() method (#192) 2023-01-12 17:13:03 +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