Merge with upstream

scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/python/scmhooks.py

@@ -98,10 +98,6 @@ def callback(ui, repo, hooktype, node=None):
   return abort
 
 def preHook(ui, repo, hooktype, node=None, source=None, pending=None, **kwargs):
-  log_file = open("/tmp/hg_callback.log", "a")
-  log_file.write("in callHookUrl\n")
-  log_file.close()
-
   # older mercurial versions
   if pending != None:
     pending()

scm-ui-components/packages/ui-components/src/layout/Page.js

@@ -44,11 +44,22 @@ class Page extends React.Component<Props> {
   renderPageHeader() {
     const { title, subtitle, children, classes } = this.props;
 
-    let content = null;
+    let pageActions = null;
     let pageActionsExists = false;
     React.Children.forEach(children, child => {
       if (child && child.type.name === PageActions.name) {
-        content = child;
+        pageActions = (
+          <div className="column is-two-fifths">
+            <div
+              className={classNames(
+                classes.spacing,
+                "is-mobile-create-button-spacing"
+              )}
+            >
+              {child}
+            </div>
+          </div>
+        );
         pageActionsExists = true;
       }
     });
@@ -63,9 +74,7 @@ class Page extends React.Component<Props> {
             <Title title={title} />
             <Subtitle subtitle={subtitle} />
           </div>
-          <div className="column is-two-fifths">
-            <div className={classNames(classes.spacing, "is-mobile-create-button-spacing")}>{content}</div>
-          </div>
+          {pageActions}
         </div>
         {underline}
       </>