[REL] saas-12.5

KangOl · Aug 27, 2019 · 28f7050 · 28f7050
1 parent 08dc822
commit 28f7050
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/_active_branches.sh b/_active_branches.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -e
-branches=(7.0 8.0 saas-6 9.0 10.0 saas-14 saas-15 11.0 saas-11.3 12.0 saas-12.3 saas-12.4 master)
+branches=(7.0 8.0 saas-6 9.0 10.0 saas-14 saas-15 11.0 saas-11.3 12.0 saas-12.3 saas-12.4 saas-12.5 master)
 declare -A prevs
 declare -A nexts
 for i in "${!branches[@]}"; do

diff --git a/git-commit-merge b/git-commit-merge
@@ -149,7 +149,7 @@ function check_saas124() {
     assert_not_in_diff py '\bself\.phantom_js\(' "Use $(em self.start_tour) helper instead of $(em self.phantom_js)"
 }
 
-function check_master() {
+function check_saas125() {
     assert_not_in_diff py '@api\.multi\b'
     assert_not_in_diff py '\.sudo\((?!True\)|False\)|\))' "Use $(em with_user) to change active user"
     assert_not_in_diff py '\boldname\b'