Skip to content

Commit

Permalink
Merge branch 'master' of github.com:nightscout/cgm-remote-monitor
Browse files Browse the repository at this point in the history
* 'master' of github.com:nightscout/cgm-remote-monitor: (284 commits)
  Update config.yml
  Delete --individual-troubleshooting-help.md
  Create config.yml
  Update README.md
  Make empty cache detection a bit more aggressive to account for cache flush and data insert happening concurrently
  Support uploading device statuses in batches (nightscout#6147)
  Bump version to 14.0.6
  Fix MONGODB_URI reference in error message
  Add error cat to error page
  Fix memory leak and cache update issues in 14.0.4 (nightscout#6133)
  Update --individual-troubleshooting-help.md
  Update --bug-report.md
  Update --feature-request--.md
  Remove require statement breaking deploys
  Fix tests
  Add file missing from last commit
  Less intimidating error page on start, which also checks for api_secret
  Don't report an error on every reconnect
  * Fix security test * Change boot and caching to expose Mongo connection errors
  Make settings parsing whitespace tolerant
  ...

# Conflicts:
#	app.json
  • Loading branch information
Robert Wild committed Nov 7, 2020
2 parents 1119a83 + bc55b07 commit c9fe11e
Show file tree
Hide file tree
Showing 236 changed files with 21,924 additions and 8,058 deletions.
9 changes: 9 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@ module.exports = {
"commonjs": true,
"es6": true,
"node": true,
"mocha": true,
"jquery": true
},
"rules": {
"no-unused-vars": [
"error",
{
"varsIgnorePattern": "should|expect"
}
]
}
};
4 changes: 4 additions & 0 deletions .github/ISSUE_TEMPLATE/--bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ label: bug

---

**If you need support for Nightscout, PLEASE DO NOT FILE A TICKET HERE**
For support, please post a question to the "CGM in The Cloud" group in Facebook
(https://www.facebook.com/groups/cgminthecloud) or visit the WeAreNotWaiting Discord at https://discord.gg/zg7CvCQ

**Describe the bug**
A clear and concise description of what the bug is.

Expand Down
4 changes: 4 additions & 0 deletions .github/ISSUE_TEMPLATE/--feature-request--.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ about: Suggest an idea for this project

---

**If you need support for Nightscout, PLEASE DO NOT FILE A TICKET HERE**
For support, please post a question to the "CGM in The Cloud" group in Facebook
(https://www.facebook.com/groups/cgminthecloud) or visit the WeAreNotWaiting Discord at https://discord.gg/zg7CvCQ

**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 [...]

Expand Down
16 changes: 0 additions & 16 deletions .github/ISSUE_TEMPLATE/--individual-troubleshooting-help.md

This file was deleted.

11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
blank_issues_enabled: false
contact_links:
- name: Troubleshooting Documentation
url: http://nightscout.github.io/troubleshoot/troublehoot/
about: Having trouble with Nightscout? Please check our step by step troubleshooting instructions.
- name: Nightscout Community Support in Facebook
url: https://www.facebook.com/groups/cgminthecloud
about: If you're a Nightscout user and have trouble with your site, please post questions here. We don't have the resources to answer support questions posted here as tickets.
- name: Nightscout Community Support in Discord
url: https://discord.gg/zg7CvCQ
about: If you're a Nightscout user and have trouble with your site, please post questions here. We don't have the resources to answer support questions posted here as tickets.
34 changes: 34 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: CI test

on: [push, pull_request]

jobs:
build:

runs-on: ubuntu-16.04

strategy:
matrix:
node-version: [12.x]

steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: Install dependencies
run: npm install
- name: Install MongoDB
run: |
wget -qO - https://www.mongodb.org/static/pgp/server-4.4.asc | sudo apt-key add -
echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/4.4 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-4.4.list
sudo apt-get update
sudo apt-get install -y mongodb-org
sudo apt-get install -y --allow-downgrades mongodb-org=4.4.0 mongodb-org-server=4.4.0 mongodb-org-shell=4.4.0 mongodb-org-mongos=4.4.0 mongodb-org-tools=4.4.0
- name: Start MongoDB
run: sudo systemctl start mongod
- name: Run Tests
run: npm run-script test-ci
- name: Send Coverage
run: npm run-script coverage
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ bundle/bundle.out.js
.idea/
*.iml
my.env
my.*.env

*.env
static/bower_components/
.*.sw?
.DS_Store
Expand All @@ -24,3 +24,9 @@ npm-debug.log
*.heapsnapshot

/tmp
/.vs
/cgm-remote-monitor.njsproj
/cgm-remote-monitor.sln
/obj/Debug
/bin
/*.bat
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ matrix:
allow_failures:
node_js: "node"
include:
- node_js: "8"
<<: *node_js-steps
- node_js: "10"
<<: *node_js-steps
- node_js: "node" # Latest Node is not supported, and recommend, but we'll test it to know incompatibility issues
- node_js: "12" # Latest Node is not supported, and recommend, but we'll test it to know incompatibility issues
<<: *node_js-steps
Loading

0 comments on commit c9fe11e

Please sign in to comment.