Skip to content

Commit

Permalink
Merge pull request #136 from openstad/master
Browse files Browse the repository at this point in the history
Nieuwe release van master
  • Loading branch information
LorenzoJokhan committed May 5, 2023
2 parents f62ed17 + c4f6946 commit 32ee99c
Show file tree
Hide file tree
Showing 28 changed files with 197 additions and 110 deletions.
37 changes: 37 additions & 0 deletions .github/ISSUE_TEMPLATE/bugs.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

Provide a general summary of the issue

**Expected Behavior**
Tell us what should happen

**Current Behavior**
Tell us what happens instead of the expected behavior

**Possible Solution**
Not obligatory, but suggest a fix/reason for the bug,

**Steps to Reproduce**
Provide a link to a live example, or an unambiguous set of steps to
reproduce this bug. Include code to reproduce, if relevant
1.
2.
3.
4.

**Context (Environment)**
How has this issue affected you? What are you trying to accomplish?
Providing context helps us come up with a solution that is most useful in the real world

**Detailed Description**
Provide a detailed description of the change or addition you are proposing

**Possible Implementation**
Not obligatory, but suggest an idea for implementing addition or change
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: true
contact_links:
- name: Community Support
url: https://openstad.org/hulp-en-community
about: Please ask and answer questions in our Slack channel
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
30 changes: 30 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<!-- Please fill in the appropriate information -->

# Description

Please include
- a summary of the changes
- relevant motivation and context
- a list of any dependencies that are required for this change

## Issue reference

Fixes # (issue)

## Type of change

Is it a new feature, bug fix, code improvement, etc.
If it is a breaking change what needs to be done to fix that

## Documentation

Is the documentation updated, maybe a link

## Tests

(How) has the change been tested

## Branch

If the branch to merge to is not development

2 changes: 1 addition & 1 deletion knexfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const connection = {
password: process.env.DB_PASSWORD,
};

if (process.env.MYSQL_CA_CERT) {
if (process.env.MYSQL_CA_CERT && process.env.MYSQL_CA_CERT.trim && process.env.MYSQL_CA_CERT.trim()) {
connection.ssl = {
rejectUnauthorized: true,
ca: [ process.env.MYSQL_CA_CERT ]
Expand Down
127 changes: 21 additions & 106 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"express-validator": "^5.3.0",
"fast-csv": "^4.3.6",
"hat": "0.0.3",
"jsonwebtoken": "^8.4.0",
"jsonwebtoken": "^9.0.0",
"knex": "^0.21.21",
"less": "^3.12.2",
"md5": "^2.2.1",
Expand Down

1 comment on commit 32ee99c

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Published new image: openstad/auth:release-32ee99c

Please sign in to comment.