Prepare Mergify for changing the default branch to 1.6.x

2 files changed, 5 insertions, 5 deletions

diff --git a/.mergify.yml b/.mergify.yml
index 89f935ff..d44ac038 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -8,7 +8,7 @@ pull_request_rules:
   - status-success=all tests passed
   - '#approved-reviews-by>=1'
   - '#changes-requested-reviews-by=0'
-  - base=master
+  - base=1.6.x
   - label="Please Merge"
   - label!="DO NOT MERGE"
   - label!="bp-conflict"
@@ -20,7 +20,7 @@ pull_request_rules:
 - name: backport to 1.5.x
   conditions:
   - merged
-  - base=master
+  - base=1.6.x
   - milestone=1.5.x
   actions:
     backport:
@@ -36,7 +36,7 @@ pull_request_rules:
 - name: backport to 1.4.x, 1.5.x
   conditions:
   - merged
-  - base=master
+  - base=1.6.x
   - milestone=1.4.x
   actions:
     backport:
@@ -53,7 +53,7 @@ pull_request_rules:
 - name: backport to 1.3.x, 1.4.x, 1.5.x
   conditions:
   - merged
-  - base=master
+  - base=1.6.x
   - milestone=1.3.x
   actions:
     backport:
diff --git a/build.sbt b/build.sbt
index 4c6c2456..3b3c41b8 100644
--- a/build.sbt
+++ b/build.sbt
@@ -152,7 +152,7 @@ lazy val docSettings = Seq(
     "-doc-source-url", {
       val branch =
         if (version.value.endsWith("-SNAPSHOT")) {
-          "master"
+          "1.6.x"
         } else {
           s"v${version.value}"
         }