Fixed automerge activation

matllubos · matllubos · commit 07db024562c3 · 2025-01-07T19:09:42.000+01:00
diff --git a/developers_chamber/gitlab_utils.py b/developers_chamber/gitlab_utils.py
@@ -44,7 +44,7 @@ def activate_automerge(
         },
     )
     if merge_response.status_code != 200:
-        raise "Automerge activation failed"
+        return "Automerge activation failed"
     else:
         return "Automerge activated"
 
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name="developers-chamber",
-    version="0.1.28",
+    version="0.1.29",
     description="A small plugin which help with development, deployment, git",
     keywords="django, skripts, easy live, git, bitbucket, Jira",
     author="Druids team",

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ def activate_automerge(`
`44`	`44`	`},`
`45`	`45`	`)`
`46`	`46`	`if merge_response.status_code != 200:`
`47`		`- raise "Automerge activation failed"`
	`47`	`+ return "Automerge activation failed"`
`48`	`48`	`else:`
`49`	`49`	`return "Automerge activated"`
`50`	`50`