Merge remote-tracking branch 'remotes/upstream/master'

eclipse-che · Aug 18, 2016 · e64d5d7 · e64d5d7
2 parents bb0747e + bb146d1
commit e64d5d7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/dashboard/src/components/widget/toolbar/che-toolbar.styl b/dashboard/src/components/widget/toolbar/che-toolbar.styl
@@ -35,7 +35,6 @@ $toolbar-height = 60px
 
 .che-toolbar-title
   white-space nowrap
-  text-transform capitalize
 
 .che-toolbar-title-icons
   margin-left 10px

diff --git a/...in-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/merge/MergePresenter.java b/...in-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/merge/MergePresenter.java
@@ -213,7 +213,7 @@ private String formMergeMessage(@NotNull MergeResult mergeResult) {
             }
         }
 
-        String message = "<b>" + mergeResult.getMergeStatus().getValue() + "</b>";
+        String message = mergeResult.getMergeStatus().getValue();
         String conflictText = conflictMessage.toString();
         message += (!conflictText.isEmpty()) ? constant.mergedConflicts() : "";
 

diff --git a/...-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/SubversionExtension.java b/...-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/SubversionExtension.java
@@ -199,8 +199,7 @@ public SubversionExtension(final ActionManager actionManager,
 
         contextGroup.getTemplatePresentation().setSVGResource(resources.svn());
 
-        DefaultActionGroup mainContextMenuGroup = (DefaultActionGroup)actionManager.getAction(IdeActions.GROUP_MAIN_CONTEXT_MENU);
-        mainContextMenuGroup.addSeparator();
-        mainContextMenuGroup.add(contextGroup);
+        DefaultActionGroup resourceOperationPartOfMainContextMenuGroup = (DefaultActionGroup)actionManager.getAction("resourceOperation");
+        resourceOperationPartOfMainContextMenuGroup.add(contextGroup);
     }
 }