Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Branch settings and templates #757

Merged
merged 7 commits into from
Nov 26, 2024
Merged

Conversation

GilianJuice
Copy link
Contributor

@GilianJuice GilianJuice commented Nov 20, 2024

Describe your changes

NOTE: If you approve this PR, please don't merge it yet, otherwise Wiser will not compile. First the PR happy-geeks/geeks-core-library#700 needs to be approved, then we need to make a new version of the GCL with this change and add that GCL version to Wiser.

Added a new module for managing settings for automatic deployments of projects that use Wiser branches. The WTS will then use these settings to execute the deployment. This module will be added automatically for all customers/tenants, but they won't see the module because no permissions are added. This is by design, because most customers won't need this module for now. But this way the module can be easily added for a customer by just adding permissions for it.

Also added functionality for creating branch merge templates. These templates can then be used in the WTS. This is designed to also be able to use these templates in Wiser, so that users can select an existing template when they want to start a merge. Tha functionality is not added yet though, because it's not part of the scope of this ticket.

Type of change

Please check only ONE option.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

How was this tested?

In Wiser via the wiser demo tenant and some other test tenants. Then I created some templates and checked the database if everything was saved correctly. Also tested the module by filling in some test data and see if it all gets saved correctly.

Checklist before requesting a review

  • I have reviewed and tested my changes
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I selected develop as the base branch and not main, or the pull request is a hotfix that needs to be done directly on main
  • I double checked all my changes and they contain no temporary test code, no code that is commented out and no changes that are not part of this branch
  • I added new unit tests for my changes if applicable

Related pull requests

happy-geeks/geeks-core-library#700

Link to Asana ticket

https://app.asana.com/0/7257459017111/1208747317644039

@MikeVanMourik
Copy link
Contributor

approved but not merged because of the Note in the description

@GilianJuice GilianJuice merged commit bf39a6c into develop Nov 26, 2024
@GilianJuice GilianJuice deleted the feature/branch-settings-module branch November 26, 2024 15:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants