Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

f8f70cb8

Commit f8f70cb8 authored 4 months ago by Klas Arvidsson

Downloads
- Plain Diff

Merge branch 'devel' into 'production'

Devel

See merge request !62

parents 56fb8bb9 1e3c9d5b

No related branches found

No related tags found

1 merge request!62Devel

Checking pipeline status

Changes 14
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 7 additions, 0 deletions

.gitignore
.pdkignore 8 additions, 0 deletions

.pdkignore
.puppet-lint.rc 2 additions, 0 deletions

.puppet-lint.rc
.rubocop.yml 7 additions, 0 deletions

.rubocop.yml
.vscode/extensions.json 1 addition, 0 deletions

.vscode/extensions.json
Gemfile 17 additions, 9 deletions

Gemfile
Rakefile 3 additions, 78 deletions

Rakefile
files/squid/helpers/rules.d/office.forms.rules 17 additions, 0 deletions

files/squid/helpers/rules.d/office.forms.rules
files/squid/helpers/rules.d/python.rules 22 additions, 0 deletions

files/squid/helpers/rules.d/python.rules
files/squid/helpers/squid-url-rewrite.py 30 additions, 20 deletions

files/squid/helpers/squid-url-rewrite.py
manifests/init.pp 0 additions, 6 deletions

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

metadata.json
spec/default_facts.yml 4 additions, 3 deletions

spec/default_facts.yml
spec/spec_helper.rb 3 additions, 2 deletions

spec/spec_helper.rb

with 123 additions and 120 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