Skip to content

Commit

Permalink
Merge pull request #1151 from ChildMindInstitute/release/1.3.16
Browse files Browse the repository at this point in the history
Release/1.3.16
  • Loading branch information
vshvechko authored Mar 6, 2024
2 parents 53792f6 + 813bf78 commit a11a2b2
Show file tree
Hide file tree
Showing 45 changed files with 2,840 additions and 4,555 deletions.
7 changes: 5 additions & 2 deletions .env.default
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@ REDIS__HOST=redis

# CORS
CORS__ALLOW_ORIGINS=*
#CORS__ALLOW_ORIGINS_REGEX=
CORS__ALLOW_CREDENTIALS=true
CORS__ALLOW_METHODS=*
CORS__ALLOW_HEADERS=*



# Authentication
AUTHENTICATION__ACCESS_TOKEN__SECRET_KEY="secret1"
AUTHENTICATION__REFRESH_TOKEN__SECRET_KEY="secret2"
Expand Down Expand Up @@ -80,7 +82,8 @@ MONGO__DB=mindlogger
MONGO__AES_KEY=

# RabbitMq
RABBITMQ__USE_SSL=False
# Uncommnent for local development
# RABBITMQ__USE_SSL=False
RABBITMQ__URL=rabbitmq


GIRDER_MONGO_URI="mongodb://localhost:27017/mindlogger"
53 changes: 49 additions & 4 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,52 @@
resolves: M2-####
<!-- Use this template as a guide to describe your pull request, and adjust as necessary. -->
<!-- Include information that helps your peers review your updates and understand this -->
<!-- repository's history of changes over time. -->

### Objective
<!-- Delete any options that are not relevant -->

### Notes
- [ ] Tests for the changes have been added
- [ ] Related documentation has been added / updated
- [ ] OSS packages added to MindLogger [open source credit page](https://mindlogger.atlassian.net/jira/servicedesk/projects/MLA/knowledge/articles/340623543?spaceKey=MLA)

### Follow up tasks
### 📝 Description

<!-- Contributions are welcome! If there is a corresponding -->
<!-- JIRA ticket, link to it by replacing `#` with ticket number -->

🔗 [Jira Ticket M2-#](https://mindlogger.atlassian.net/browse/M2-#)

<!-- Uncomment if this PR includes a breaking change to the API -->
<!-- ##### ❗BREAKING CHANGE! -->

<!-- Replace this with a high-level description of the features/functionality proposed in the pull request. -->

Changes include:

- [Thing]
- [Other thing]
- [More things]

### 🪤 Peer Testing

<!-- If peer testing is not needed, then delete this section -->
<!-- Uncomment out any of the following as needed: -->
<!-- **Requires `pipenv shell`** -->
<!-- **Requires `pipenv sync --dev`** -->

<!--
Replace this with a series of test steps & expected outcomes.
Example test step:
- This is a test step. Highlight actions **in bold**.
**Expected outcome:** This is what to expect after the step
-->

### ✏️ Notes

<!--
Replace this line with anything else you think may be relevant or related PRs
If there are no notes, then delete this section.
-->
1 change: 1 addition & 0 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ jobs:
- name: "Running tests"
run: |
cp .env.default .env
echo -e "\nRABBITMQ__USE_SSL=False" >> .env
docker compose up -d
make dtest
173 changes: 173 additions & 0 deletions LICENSE.MD

Large diffs are not rendered by default.

Loading

0 comments on commit a11a2b2

Please sign in to comment.