From 1b59e27774991a2933ea9843056f6052441bbae9 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Wed, 26 Sep 2018 15:55:55 +0300 Subject: [PATCH] github: remove "Rebase GitHub fork" action from VCS Operations popup --- .../git4idea/actions/GitQuickListContentProvider.java | 10 ---------- .../git4idea/src/git4idea/i18n/GitBundle.properties | 2 -- 2 files changed, 12 deletions(-) diff --git a/plugins/git4idea/src/git4idea/actions/GitQuickListContentProvider.java b/plugins/git4idea/src/git4idea/actions/GitQuickListContentProvider.java index c533b8369dd3..e8cd09416671 100644 --- a/plugins/git4idea/src/git4idea/actions/GitQuickListContentProvider.java +++ b/plugins/git4idea/src/git4idea/actions/GitQuickListContentProvider.java @@ -5,10 +5,8 @@ import com.intellij.dvcs.actions.DvcsQuickListContentProvider; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.DataContext; -import com.intellij.openapi.actionSystem.Separator; import com.intellij.openapi.project.Project; import git4idea.GitVcs; -import git4idea.i18n.GitBundle; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -31,14 +29,6 @@ public class GitQuickListContentProvider extends DvcsQuickListContentProvider { add("ChangesView.AddUnversioned", manager, actions); add("Git.ResolveConflicts", manager, actions); - - // Github - addSeparator(actions); - final AnAction githubRebase = manager.getAction("Github.Rebase"); - if (githubRebase != null) { - actions.add(new Separator(GitBundle.message("vcs.popup.git.github.section"))); - actions.add(githubRebase); - } } @Override diff --git a/plugins/git4idea/src/git4idea/i18n/GitBundle.properties b/plugins/git4idea/src/git4idea/i18n/GitBundle.properties index f8c243cd8fe1..b0e29b438a72 100644 --- a/plugins/git4idea/src/git4idea/i18n/GitBundle.properties +++ b/plugins/git4idea/src/git4idea/i18n/GitBundle.properties @@ -488,8 +488,6 @@ git.unstash.clear.confirmation.title=Remove All Stashes? git.unstash.drop.confirmation.message=Do you want to remove {0}?
"{1}" git.unstash.drop.confirmation.title=Remove Stash {0}? -vcs.popup.git.github.section=GitHub - vcs.history.action.gitlog=Select in Git Log vcs.history.action.gitlog.error=Git Log is not Ready