Merge branch 'master' into hockeyapp

.circleci/config.yml

@@ -44,11 +44,6 @@ jobs:
           when: always
           command: npm run lint
 
-      - run:
-          name: Prepare test summary
-          when: always
-          command: mkdir junit
-
       - run:
           name: Server unit tests
           when: always
@@ -103,11 +98,6 @@ jobs:
           when: always
           command: npm run lint
 
-      - run:
-          name: Prepare test summary
-          when: always
-          command: mkdir junit
-
       - run:
           name: Server unit tests
           when: always
@@ -181,11 +171,6 @@ jobs:
           name: Prepare frontend tests
           command: npm run defs && npm run features
 
-      - run:
-          name: Prepare test summary
-          when: always
-          command: mkdir junit
-
       - run:
           name: Frontend unit tests
           environment:
@@ -207,12 +192,6 @@ jobs:
     steps:
       - checkout
 
-      - run:
-          name: Prepare service tests
-          command: |
-            mkdir private
-            echo "{\"gh_token\":\"$GITHUB_TOKEN\", \"wheelmap_token\":\"$WHEELMAP_TOKEN\"}" > private/secret.json
-
       - restore_cache:
           keys:
             - v2-dependencies-{{ checksum "package.json" }}
@@ -227,11 +206,6 @@ jobs:
           name: Identify services tagged in the PR title
           command: npm run test:services:pr:prepare
 
-      - run:
-          name: Prepare test summary
-          when: always
-          command: mkdir junit
-
       - run:
           name: Run tests for tagged services
           environment:
@@ -248,12 +222,6 @@ jobs:
     steps:
       - checkout
 
-      - run:
-          name: Prepare service tests
-          command: |
-            mkdir private
-            echo "{\"gh_token\":\"$GITHUB_TOKEN\"}" > private/secret.json
-
       - restore_cache:
           keys:
             - v2-dependencies-{{ checksum "package.json" }}
@@ -268,11 +236,6 @@ jobs:
           name: Identify services tagged in the PR title
           command: npm run test:services:pr:prepare
 
-      - run:
-          name: Prepare test summary
-          when: always
-          command: mkdir junit
-
       - run:
           name: Run tests for tagged services
           environment:

.eslintrc-frontend.yml

@@ -4,21 +4,21 @@ env:
 plugins:
   - import
 
-parser: "babel-eslint"
+parser: 'babel-eslint'
 
 parserOptions:
-  sourceType: "module"
+  sourceType: 'module'
 
 extends:
-  - "standard-jsx"
-  - "standard-react"
-  - "./.eslintrc.yml"
+  - 'standard-jsx'
+  - 'standard-react'
+  - './.eslintrc.yml'
 
 settings:
   react:
-    version: "16.4"
+    version: '16.4'
 
 rules:
-  no-console: "error"
+  no-console: 'error'
 
-  import/extensions: ["error", "never", { "json": "always", "yml": "always" }]
+  import/extensions: ['error', 'never', { 'json': 'always', 'yml': 'always' }]

.eslintrc.yml

@@ -9,41 +9,41 @@ env:
 parserOptions:
   # Override eslint-config-standard, which incorrectly sets this to "module",
   # though that setting is only for ES6 modules, not CommonJS modules.
-  sourceType: "script"
+  sourceType: 'script'
 
 plugins:
   - mocha
   - no-extension-in-require
-  - "chai-friendly"
+  - 'chai-friendly'
 
 rules:
   # Disable some rules from eslint:recommended.
-  no-console: "off"
-  no-empty: ["error", { "allowEmptyCatch": true }]
+  no-console: 'off'
+  no-empty: ['error', { 'allowEmptyCatch': true }]
   # Allow unused parameters. In callbacks, removing them seems to obscure
   # what the functions are doing.
-  no-unused-vars: ["error", {"args": "none"}]
+  no-unused-vars: ['error', { 'args': 'none' }]
 
   # These should be disabled by eslint-config-prettier, but are not.
-  spaced-comment: "off"
-  standard/object-curly-even-spacing: "off"
-  one-var: "off"
+  spaced-comment: 'off'
+  standard/object-curly-even-spacing: 'off'
+  one-var: 'off'
 
   # Shields additions.
-  no-var: "error"
-  prefer-const: "error"
-  strict: "error"
-  arrow-body-style: ["error", "as-needed"]
-  no-extension-in-require/main: "error"
-  object-shorthand: ["error", "properties"]
-  prefer-template: "error"
-  promise/prefer-await-to-then: "error"
+  no-var: 'error'
+  prefer-const: 'error'
+  strict: 'error'
+  arrow-body-style: ['error', 'as-needed']
+  no-extension-in-require/main: 'error'
+  object-shorthand: ['error', 'properties']
+  prefer-template: 'error'
+  promise/prefer-await-to-then: 'error'
 
   # Mocha-related.
-  mocha/no-exclusive-tests: "error"
-  mocha/no-mocha-arrows: "error"
-  mocha/prefer-arrow-callback: "error"
+  mocha/no-exclusive-tests: 'error'
+  mocha/no-mocha-arrows: 'error'
+  mocha/prefer-arrow-callback: 'error'
 
   # Chai friendly.
-  no-unused-expressions: "off"
-  chai-friendly/no-unused-expressions: "error"
+  no-unused-expressions: 'off'
+  chai-friendly/no-unused-expressions: 'error'

.github/ISSUE_TEMPLATE/1_Bug_report.md

@@ -1,26 +1,28 @@
 ---
 name: 🐛 Bug Report
 about: Report errors and problems
-
 ---
 
 Are you experiencing an issue with...
- - [ ] [shields.io](https://shields.io/#/)
- - [ ] My own instance
- - [ ] [gh-badges NPM package](https://www.npmjs.com/package/gh-badges)
+
+- [ ] [shields.io](https://shields.io/#/)
+- [ ] My own instance
+- [ ] [gh-badges NPM package](https://www.npmjs.com/package/gh-badges)
 
 :beetle: **Description**
+
 <!-- A clear and concise description of the problem. -->
 
 :link: **Link to the badge**
+
 <!--
 If you are reporting a problem with a specific badge on shields.io,
 provide a link to a badge demonstrating the error
 -->
 
 :bulb: **Possible Solution**
-<!--- Optional: only if you have suggestions on a fix/reason for the bug -->
 
+<!--- Optional: only if you have suggestions on a fix/reason for the bug -->
 
 <!-- Love Shields? Please consider donating $10 to sustain our activities:
 👉  https://opencollective.com/shields -->

.github/ISSUE_TEMPLATE/2_Badge_request.md

@@ -1,10 +1,10 @@
 ---
 name: 💡 Badge Request
 about: Ideas for new badges
-
 ---
 
 :clipboard: **Description**
+
 <!--
 A clear and concise description of the new badge.
 
@@ -15,6 +15,7 @@ A clear and concise description of the new badge.
 -->
 
 :link: **Data**
+
 <!--
 Where can we get the data from?
 
@@ -23,6 +24,5 @@ Where can we get the data from?
 - Link to the API documentation.
 -->
 
-
 <!-- Love Shields? Please consider donating $10 to sustain our activities:
 👉  https://opencollective.com/shields -->

.github/ISSUE_TEMPLATE/3_Feature_request.md

@@ -1,12 +1,11 @@
 ---
 name: 💡 Feature Request
 about: Ideas for other new features or improvements
-
 ---
 
 :clipboard: **Description**
-<!-- A clear and concise description of the new feature. -->
 
+<!-- A clear and concise description of the new feature. -->
 
 <!-- Love Shields? Please consider donating $10 to sustain our activities:
 👉  https://opencollective.com/shields -->

.github/ISSUE_TEMPLATE/4_Support_question.md

@@ -1,17 +1,16 @@
 ---
 name: ❓ Support Question
 about: Ask a question about shields.io
-
 ---
 
 :question: **Question**
+
 <!--
 Ask your question clearly and concisely.
 
 #support on our [Discord](https://discordapp.com/invite/HjJCwm5)
 is also a great place to ask questions and get help
 -->
 
-
 <!-- Love Shields? Please consider donating $10 to sustain our activities:
 👉  https://opencollective.com/shields -->

.gitignore

@@ -96,3 +96,9 @@ typings/
 badge-examples.json
 supported-features.json
 service-definitions.yml
+
+# Local runtime configuration.
+/config/local*.yml
+
+# Template for the local runtime configuration.
+!/config/local*.template.yml

.prettierignore

@@ -4,5 +4,11 @@ package-lock.json
 /.next
 /build
 /coverage
-**/*.md
 private/*.json
+/.nyc_output
+analytics.json
+gh-badges/templates/_shields_test-template.json
+gh-badges/templates/default-template.json
+doc/TUTORIAL.md
+supported-features.json
+service-definitions.yml

.vscode/extensions.json

@@ -1,7 +1,7 @@
 {
-    "recommendations": [
-        "esbenp.prettier-vscode",
-        "EditorConfig.EditorConfig",
-        "dbaeumer.vscode-eslint"
-    ]
-}
+  "recommendations": [
+    "esbenp.prettier-vscode",
+    "EditorConfig.EditorConfig",
+    "dbaeumer.vscode-eslint"
+  ]
+}