Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

aes
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

2c625b2d

Commit 2c625b2d authored 2 years ago by Klas Arvidsson

Downloads
- Plain Diff

Merge branch 'devel' into 'production'

Devel

See merge request !29

parents 74d27071 35948a09

No related branches found

No related tags found

2 merge requests!30Merge branch 'cherry-pick-b940cfc1' into 'test',!29Devel

Pipeline #95207 passed 1 year ago

Stage: puppet

Changes 15
Pipelines 2

Hide whitespace changes

Inline Side-by-side

Showing

.devcontainer/devcontainer.json 5 additions, 11 deletions

.devcontainer/devcontainer.json
.rubocop.yml 1 addition, 1 deletion

.rubocop.yml
Gemfile 30 additions, 19 deletions

Gemfile
Rakefile 1 addition, 0 deletions

Rakefile
manifests/aes_sw.pp 9 additions, 9 deletions

manifests/aes_sw.pp
manifests/auth.pp 3 additions, 4 deletions

manifests/auth.pp
manifests/auth_keydb.pp 3 additions, 4 deletions

manifests/auth_keydb.pp
manifests/broker.pp 1 addition, 2 deletions

manifests/broker.pp
manifests/examfiles.pp 0 additions, 2 deletions

manifests/examfiles.pp
manifests/init.pp 1 addition, 2 deletions

manifests/init.pp
manifests/latex.pp 0 additions, 3 deletions

manifests/latex.pp
manifests/opendsa.pp 1 addition, 3 deletions

manifests/opendsa.pp
manifests/squid_filter.pp 0 additions, 2 deletions

manifests/squid_filter.pp
manifests/tal_cli.pp 23 additions, 3 deletions

manifests/tal_cli.pp
metadata.json 2 additions, 2 deletions

metadata.json

with 80 additions and 67 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