From f980f8f70554ca19b8f4efa53646f8a82ec3a15b Mon Sep 17 00:00:00 2001 From: Igor Vinokur Date: Fri, 12 Aug 2016 13:02:28 +0300 Subject: [PATCH 1/4] CHE-1884: Move down svn item in the context menu --- .../org/eclipse/che/plugin/svn/ide/SubversionExtension.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/SubversionExtension.java b/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/SubversionExtension.java index 2db370661089..4fb5c092ae4d 100644 --- a/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/SubversionExtension.java +++ b/plugins/plugin-svn/che-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(); + DefaultActionGroup mainContextMenuGroup = (DefaultActionGroup)actionManager.getAction("resourceOperation"); mainContextMenuGroup.add(contextGroup); } } From 2c9fc12701e6829449ddf85cccd9d26602b8df63 Mon Sep 17 00:00:00 2001 From: Igor Vinokur Date: Mon, 15 Aug 2016 12:36:21 +0300 Subject: [PATCH 2/4] fixup! CHE-1884: Move down svn item in the context menu --- .../org/eclipse/che/plugin/svn/ide/SubversionExtension.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/SubversionExtension.java b/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/SubversionExtension.java index 4fb5c092ae4d..5501dc93afb4 100644 --- a/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/SubversionExtension.java +++ b/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/SubversionExtension.java @@ -199,7 +199,7 @@ public SubversionExtension(final ActionManager actionManager, contextGroup.getTemplatePresentation().setSVGResource(resources.svn()); - DefaultActionGroup mainContextMenuGroup = (DefaultActionGroup)actionManager.getAction("resourceOperation"); - mainContextMenuGroup.add(contextGroup); + DefaultActionGroup resourceOperationPartOfMainContextMenuGroup = (DefaultActionGroup)actionManager.getAction("resourceOperation"); + resourceOperationPartOfMainContextMenuGroup.add(contextGroup); } } From 87b712b3554acf78a7b27c165eaac53a67b2abb6 Mon Sep 17 00:00:00 2001 From: Oleksii Kurinnyi Date: Mon, 8 Aug 2016 14:03:56 +0300 Subject: [PATCH 3/4] CHE-1848: name of workspace is displayed correctly Signed-off-by: Oleksii Kurinnyi --- dashboard/src/components/widget/toolbar/che-toolbar.styl | 1 - 1 file changed, 1 deletion(-) diff --git a/dashboard/src/components/widget/toolbar/che-toolbar.styl b/dashboard/src/components/widget/toolbar/che-toolbar.styl index 63329d61e287..b33fdfba85e5 100644 --- 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 From 7cff0790dc6611b908da078077bf942765d55ce2 Mon Sep 17 00:00:00 2001 From: Igor Vinokur Date: Fri, 12 Aug 2016 14:16:58 +0300 Subject: [PATCH 4/4] CHE-1859: Fix Merge success message --- .../eclipse/che/ide/ext/git/client/merge/MergePresenter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/merge/MergePresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/merge/MergePresenter.java index bee760f32f14..67ccede50cab 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/merge/MergePresenter.java +++ b/plugins/plugin-git/che-plugin-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 = "" + mergeResult.getMergeStatus().getValue() + ""; + String message = mergeResult.getMergeStatus().getValue(); String conflictText = conflictMessage.toString(); message += (!conflictText.isEmpty()) ? constant.mergedConflicts() : "";