From 02f48053f1328055bef548bf2627e8f71c919a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20D=C3=A1vila?= Date: Fri, 12 Feb 2016 10:08:42 -0500 Subject: [PATCH] No longer need to ignore temporary branch. * Now it's only created when user choose to create a MR and logic to hide it is handled by https://gitlab.com/gitlab-org/gitlab-ce/blob/50595af7b0e304f16e2955109abd2d25cd96efda/app/helpers/application_helper.rb#L139 --- app/helpers/application_helper.rb | 2 -- app/models/commit.rb | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 44a62143cf7..f0aa2b57121 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -135,8 +135,6 @@ module ApplicationHelper # Skip if user removed branch right after that return false unless project.repository.branch_names.include?(event.branch_name) - return false if event.branch_name =~ Gitlab::Git::REVERT_BRANCH_PATTERN - true end diff --git a/app/models/commit.rb b/app/models/commit.rb index 1237c50b759..beae2fe7a1a 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -216,7 +216,7 @@ class Commit end def revert_branch_name - "revert-#{project.id}-#{short_id}" + "revert-#{short_id}" end def revert_message -- GitLab