Merge branch 'staging' into production

.flake8

@@ -0,0 +1,32 @@
+[flake8]
+ignore =
+    E121,
+    E126,
+    E127,
+    E128,
+    E203,
+    E225,
+    E226,
+    E231,
+    E241,
+    E251,
+    E261,
+    E265,
+    E302,
+    E303,
+    E305,
+    E402,
+    E501,
+    E741,
+    W291,
+    W292,
+    W293,
+    W391,
+    W503,
+    W504,
+    F403,
+    B007,
+    B950,
+    W191,
+
+max-line-length = 200

.mergify.yml

@@ -0,0 +1,24 @@
+pull_request_rules:
+  - name: Automatic merge on CI success and review
+    conditions:
+      - status-success=Sider
+      - status-success=Semantic Pull Request
+      - status-success=Codacy Static Code Analysis
+      - status-success=security/snyk (Bloomstack)
+      - label!=Don't Merge
+      - label!=squash
+      - "#approved-reviews-by>=1"
+    actions:
+      merge:
+        method: merge
+  - name: Automatic squash on CI success and review
+    conditions:
+      - status-success=Sider
+      - status-success=Codacy Static Code Analysis
+      - status-success=security/snyk (Bloomstack)
+      - label!=Don't Merge
+      - label=squash
+      - "#approved-reviews-by>=1"
+    actions:
+      merge:
+        method: squash

bloomstack_core/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-__version__ = '2.1.0'
+__version__ = '2.2.0'