Merge branch 'master' into faster-verify

mozilla · Mar 29, 2019 · 591c760 · 591c760
2 parents 9905e0e + ebf498c
commit 591c760
Show file tree

Hide file tree

Showing 20 changed files with 33 additions and 4,245 deletions.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1,15 @@
+# Community Participation Guidelines
+
+This repository is governed by Mozilla's code of conduct and etiquette guidelines. 
+For more details, please read the
+[Mozilla Community Participation Guidelines](https://www.mozilla.org/about/governance/policies/participation/). 
+
+## How to Report
+For more information on how to report violations of the Community Participation Guidelines, please read our '[How to Report](https://www.mozilla.org/about/governance/policies/participation/reporting/)' page.
+
+<!--
+## Project Specific Etiquette
+
+In some cases, there will be additional project etiquette i.e.: (https://bugzilla.mozilla.org/page.cgi?id=etiquette.html).
+Please update for your project.
+-->
diff --git a/contract-tests/conftest.py b/contract-tests/conftest.py
@@ -1,10 +1,6 @@
 # Configuration file for running contract-tests
 import pytest
 import requests
-import urllib3
-
-# Disable warnings about unverified HTTPS requests
-urllib3.disable_warnings()
 
 
 def pytest_addoption(parser):

diff --git a/contract-tests/schemas/approval_request.schema b/contract-tests/schemas/approval_request.schema
diff --git a/contract-tests/schemas/classify_client.schema b/contract-tests/schemas/classify_client.schema
diff --git a/contract-tests/schemas/extension.schema b/contract-tests/schemas/extension.schema