Merging upstream version 1.11.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 6 insertions, 1 deletions

diff --git a/library/Director/Web/Widget/BranchedObjectsHint.php b/library/Director/Web/Widget/BranchedObjectsHint.php
index d689178..3f00f9e 100644
--- a/library/Director/Web/Widget/BranchedObjectsHint.php
+++ b/library/Director/Web/Widget/BranchedObjectsHint.php
@@ -13,9 +13,14 @@ class BranchedObjectsHint extends HtmlDocument
 {
     use TranslationHelper;
 
-    public function __construct(Branch $branch, Auth $auth)
+    public function __construct(Branch $branch, Auth $auth, $hasPreferredBranch = false)
     {
         if (! $branch->isBranch()) {
+            if ($hasPreferredBranch) {
+                $this->add(Hint::warning($this->translate(
+                    "You're currently in the master branch, your changes will make part of the next Deployment"
+                )));
+            }
             return;
         }
         $hook = Branch::requireHook();