Merge branch 'main' into 1116-properly-set-kratos_url (13fab661) · Commits · Varac / stackspin · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

stackspin
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

Due to spam, we had to disable registrations and GitHub login. Please reach out to us at support@greenhost.net if you want to contribute.

13fab661

Verified Commit 13fab661 authored 3 years ago by Maarten de Waard

Downloads
- Plain Diff

Merge branch 'main' into 1116-properly-set-kratos_url

parents 8a7908a8 352e0042

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 1 addition, 1 deletion

.gitlab-ci.yml
docs/requirements.txt 1 addition, 1 deletion

docs/requirements.txt
flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml 4 additions, 1 deletion

...ps/monitoring/kube-prometheus-stack-values-configmap.yaml
flux2/core/base/single-sign-on/single-sign-on-database-release.yaml 1 addition, 1 deletion

.../base/single-sign-on/single-sign-on-database-release.yaml
flux2/core/base/single-sign-on/single-sign-on-release.yaml 1 addition, 1 deletion

flux2/core/base/single-sign-on/single-sign-on-release.yaml
requirements.txt 1 addition, 1 deletion

requirements.txt
test/pytest/test_prometheus.py 1 addition, 2 deletions

test/pytest/test_prometheus.py

with 10 additions and 8 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment